diff options
11 files changed, 9 insertions, 38 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py index 9c4726fe387..a18cb2a64c7 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py @@ -36,9 +36,7 @@ class DisassembleDriverMainLoop(BenchBase): self.function = 'Driver::MainLoop()' self.lldb_avg = None self.gdb_avg = None - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 5 + self.count = 5 @benchmarks_test @no_debug_info_test diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py index 81e364d7f7f..b7b07090959 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py @@ -18,9 +18,7 @@ class AttachThenDisassemblyBench(BenchBase): def setUp(self): BenchBase.setUp(self) self.exe = lldbtest_config.lldbExec - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 10 + self.count = 10 @benchmarks_test @no_debug_info_test diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py index 3080c27146c..745e7b6a8c3 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py @@ -21,9 +21,7 @@ class XCode41Vs42GDBDisassembly(BenchBase): self.function = 'Driver::MainLoop()' self.gdb_41_avg = None self.gdb_42_avg = None - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 5 + self.count = 5 @benchmarks_test @no_debug_info_test diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py index 966b7363c4b..abf45147d63 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py @@ -17,9 +17,7 @@ class ExpressionEvaluationCase(BenchBase): BenchBase.setUp(self) self.source = 'main.cpp' self.line_to_break = line_number(self.source, '// Set breakpoint here.') - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 25 + self.count = 25 @benchmarks_test @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows") diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py index 223561eb420..e5cada3563f 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py @@ -19,9 +19,7 @@ class RepeatedExprsCase(BenchBase): self.line_to_break = line_number(self.source, '// Set breakpoint here.') self.lldb_avg = None self.gdb_avg = None - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 100 + self.count = 100 @benchmarks_test @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows") diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py index 16dd8877ecf..5fdf05763fd 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py @@ -18,10 +18,7 @@ class FrameVariableResponseBench(BenchBase): BenchBase.setUp(self) self.exe = lldbtest_config.lldbExec self.break_spec = '-n main' - - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 20 + self.count = 20 @benchmarks_test @no_debug_info_test diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py index d0532cd5eb5..a215721ed52 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py @@ -23,10 +23,7 @@ class StartupDelaysBench(BenchBase): self.stopwatch3 = Stopwatch() self.exe = lldbtest_config.lldbExec self.break_spec = '-n main' - - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 30 + self.count = 30 @benchmarks_test @no_debug_info_test diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py index db2bd73e208..14738a978e8 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py @@ -16,10 +16,7 @@ class SteppingSpeedBench(BenchBase): BenchBase.setUp(self) self.exe = lldbtest_config.lldbExec self.break_spec = '-n main' - - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 50 + self.count = 50 #print("self.exe=%s" % self.exe) #print("self.break_spec=%s" % self.break_spec) diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py index 826546da727..731eb13bbcf 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py @@ -17,10 +17,7 @@ class CompileRunToBreakpointBench(BenchBase): BenchBase.setUp(self) self.exe = lldbtest_config.lldbExec self.function = 'Driver::MainLoop()' - - self.count = configuration.bmIterationCount - if self.count <= 0: - self.count = 3 + self.count = 3 self.lldb_avg = None self.gdb_avg = None diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index a7b97bb67d3..51d57d43e34 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -86,9 +86,6 @@ compilers = None # Must be initialized after option parsing # just that. cflags_extras = '' -# The benchmark iteration count, as specified by the '-y' option. -bmIterationCount = -1 - # The filters (testclass.testmethod) used to admit tests into our test suite. filters = [] diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 1a845c5969c..25c1ffa9af3 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -359,10 +359,6 @@ def parseOptionsAndInitTestdirs(): configuration.verbose = 2 # argparse makes sure we have a number - if args.y: - configuration.bmIterationCount = args.y - - # argparse makes sure we have a number if args.sharp: configuration.count = args.sharp |
