diff options
| author | Denis Nikitin <denik@google.com> | 2019-08-30 09:10:39 -0700 |
|---|---|---|
| committer | Denis Nikitin <denik@chromium.org> | 2019-09-10 05:34:30 +0000 |
| commit | 9d114045ddf617b67fd7af5aaccd0b5dcd4282ea (patch) | |
| tree | 741ebc440d0ade50048ea78513830f84ed35875a /crosperf/settings_factory_unittest.py | |
| parent | 0f8dae198451cfc73eb6c509cbddbe9c159ea45f (diff) | |
| download | toolchain-utils-9d114045ddf617b67fd7af5aaccd0b5dcd4282ea.tar.gz | |
crosperf: Add dut config arguments to experiment
In global settings added optional arguments:
"cooldown_time" - wait time prior running a benchmark (default: 0),
"cooldown_temp" - temperature threshold for waiting (default: 40),
"governor" - CPU governor (default: performance),
"cpu_usage" - Restrict CPU usage to specific configurations (default: all).
"turbostat" argument is moved from benchmark to global settings.
Current CL does not apply configurations.
Instead it just propagates parameters to SuiteRunner class
through "dut_config" dictionary.
BUG=chromium:966514
TEST=Unitest and local HW tests passed.
Change-Id: I1b2a65883e5176fdde49c9858ebe62a097df89cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1778515
Tested-by: Denis Nikitin <denik@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Diffstat (limited to 'crosperf/settings_factory_unittest.py')
| -rwxr-xr-x | crosperf/settings_factory_unittest.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crosperf/settings_factory_unittest.py b/crosperf/settings_factory_unittest.py index cf3db353..6dfb0bff 100755 --- a/crosperf/settings_factory_unittest.py +++ b/crosperf/settings_factory_unittest.py @@ -20,12 +20,11 @@ class BenchmarkSettingsTest(unittest.TestCase): def test_init(self): res = settings_factory.BenchmarkSettings('b_settings') self.assertIsNotNone(res) - self.assertEqual(len(res.fields), 8) + self.assertEqual(len(res.fields), 7) self.assertEqual(res.GetField('test_name'), '') self.assertEqual(res.GetField('test_args'), '') self.assertEqual(res.GetField('iterations'), 0) self.assertEqual(res.GetField('suite'), '') - self.assertEqual(res.GetField('turbostat'), True) class LabelSettingsTest(unittest.TestCase): @@ -51,7 +50,7 @@ class GlobalSettingsTest(unittest.TestCase): def test_init(self): res = settings_factory.GlobalSettings('g_settings') self.assertIsNotNone(res) - self.assertEqual(len(res.fields), 30) + self.assertEqual(len(res.fields), 35) self.assertEqual(res.GetField('name'), '') self.assertEqual(res.GetField('board'), '') self.assertEqual(res.GetField('skylab'), False) @@ -78,6 +77,11 @@ class GlobalSettingsTest(unittest.TestCase): self.assertEqual(res.GetField('enable_aslr'), False) self.assertEqual(res.GetField('ignore_min_max'), False) self.assertEqual(res.GetField('intel_pstate'), '') + self.assertEqual(res.GetField('turbostat'), True) + self.assertEqual(res.GetField('cooldown_time'), 0) + self.assertEqual(res.GetField('cooldown_temp'), 40) + self.assertEqual(res.GetField('governor'), 'performance') + self.assertEqual(res.GetField('cpu_usage'), 'all') class SettingsFactoryTest(unittest.TestCase): @@ -95,12 +99,12 @@ class SettingsFactoryTest(unittest.TestCase): b_settings = settings_factory.SettingsFactory().GetSettings( 'benchmark', 'benchmark') self.assertIsInstance(b_settings, settings_factory.BenchmarkSettings) - self.assertEqual(len(b_settings.fields), 8) + self.assertEqual(len(b_settings.fields), 7) g_settings = settings_factory.SettingsFactory().GetSettings( 'global', 'global') self.assertIsInstance(g_settings, settings_factory.GlobalSettings) - self.assertEqual(len(g_settings.fields), 30) + self.assertEqual(len(g_settings.fields), 35) if __name__ == '__main__': |