diff options
Diffstat (limited to 'tests/framework')
| -rw-r--r-- | tests/framework/Framework.cpp | 4 | ||||
| -rw-r--r-- | tests/framework/SConscript | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp index 94afc87f00..d1fb28d501 100644 --- a/tests/framework/Framework.cpp +++ b/tests/framework/Framework.cpp @@ -61,12 +61,12 @@ Framework::Framework() _available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::MALI, ScaleFactor::SCALE_1K), Instrument::make_instrument<MaliCounter, ScaleFactor::SCALE_1K>); _available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::MALI, ScaleFactor::SCALE_1M), Instrument::make_instrument<MaliCounter, ScaleFactor::SCALE_1M>); #endif /* MALI_ENABLED */ -#ifdef OPENCL_TIMER_ENABLED +#ifdef ARM_COMPUTE_CL _available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::OPENCL_TIMER, ScaleFactor::NONE), Instrument::make_instrument<OpenCLTimer, ScaleFactor::NONE>); _available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::OPENCL_TIMER, ScaleFactor::TIME_US), Instrument::make_instrument<OpenCLTimer, ScaleFactor::TIME_US>); _available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::OPENCL_TIMER, ScaleFactor::TIME_MS), Instrument::make_instrument<OpenCLTimer, ScaleFactor::TIME_MS>); _available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::OPENCL_TIMER, ScaleFactor::TIME_S), Instrument::make_instrument<OpenCLTimer, ScaleFactor::TIME_S>); -#endif /* OPENCL_TIMER_ENABLED */ +#endif /* ARM_COMPUTE_CL */ } std::set<InstrumentsDescription> Framework::available_instruments() const diff --git a/tests/framework/SConscript b/tests/framework/SConscript index f4beaf85ce..e740828396 100644 --- a/tests/framework/SConscript +++ b/tests/framework/SConscript @@ -29,7 +29,6 @@ Import('vars') variables = [ BoolVariable("pmu", "Enable PMU counters", False), BoolVariable("mali", "Enable Mali hardware counters", False), - BoolVariable("opencl_timer", "Enable OpenCL timers", False) ] # We need a separate set of Variables for the Help message (Otherwise the global variables will get displayed twice) @@ -68,14 +67,9 @@ if not framework_env['pmu']: else: framework_env.Append(CPPDEFINES = ['PMU_ENABLED']) -if not framework_env['opencl_timer']: +if not env['opencl']: # Remove OpenCLTimer files files = [f for f in files if "OpenCLTimer" not in os.path.basename(str(f))] -else: - if not framework_env["opencl"]: - print("ERROR: You need opencl=1 to be able to use opencl_timer=1") - Exit(1) - framework_env.Append(CPPDEFINES = ['OPENCL_TIMER_ENABLED']) if not framework_env['mali']: # Remove MALI files |