From b024c855271e4824c310b5893c78152f1abe4474 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Tue, 1 Mar 2016 14:22:40 +0000 Subject: [PATCH 1/2] libs: update trappy to v5.2.0 --- libs/trappy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/trappy b/libs/trappy index 26cf414f6..efdf0daef 160000 --- a/libs/trappy +++ b/libs/trappy @@ -1 +1 @@ -Subproject commit 26cf414f6b6c5eca30ef12822bc03e06cb1adc34 +Subproject commit efdf0daef51c9d2d5461876c4408318160cba338 -- GitLab From 034e78621446ee8765fe4fa0f29c3a2d37d7dc5c Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Tue, 1 Mar 2016 14:18:06 +0000 Subject: [PATCH 2/2] tests: simplify stune's boosted utilization signal test Trappy 5.2 can operate on a window of a trace and can do floor division. Leverage that to simplify the boosted utilization signal test and make it more "barty". --- tests/stune/smoke_test_ramp.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/stune/smoke_test_ramp.py b/tests/stune/smoke_test_ramp.py index 62385612d..a749f8184 100644 --- a/tests/stune/smoke_test_ramp.py +++ b/tests/stune/smoke_test_ramp.py @@ -57,24 +57,22 @@ class STune(LisaTest): sbt_dfr = ftrace.sched_boost_task.data_frame boost_task_rtapp = sbt_dfr[sbt_dfr.comm == rta_task_name] + ftrace.add_parsed_event("boost_task_rtapp", boost_task_rtapp) # Avoid the first period as the task starts with a very # high load and it overutilizes the CPU rtapp_period = first_task_params[first_task_name]["params"]["period_ms"] task_start = boost_task_rtapp.index[0] after_first_period = task_start + (rtapp_period / 1000.) - boost_task_rtapp = boost_task_rtapp.ix[after_first_period:] - sched_load_scale = 1024 boost = tc["cgroups"]["conf"]["schedtune"]["/stune"]["boost"] / 100. - util = boost_task_rtapp["util"] - expected_margin = (sched_load_scale - util) * boost - expected_margin = expected_margin.astype(int) - boost_task_rtapp["expected_margin"] = expected_margin - ftrace.add_parsed_event("boost_task_rtapp", boost_task_rtapp) - - analyzer = Analyzer(ftrace, {}) - statement = "boost_task_rtapp:margin == boost_task_rtapp:expected_margin" + analyzer_const = { + "SCHED_LOAD_SCALE": 1024, + "BOOST": boost, + } + analyzer = Analyzer(ftrace, analyzer_const, + window=(after_first_period, None)) + statement = "(((SCHED_LOAD_SCALE - boost_task_rtapp:util) * BOOST) // 100) == boost_task_rtapp:margin" error_msg = "task was not boosted to the expected margin: {}".\ format(boost) self.assertTrue(analyzer.assertStatement(statement), msg=error_msg) -- GitLab