From 95edd05c75af2208c62174d135d76b897969a9af Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 22 Nov 2018 21:21:36 +0000 Subject: Combine more conformtest tests into single execution of the compiler. In , Florian reported that the change from conformtest.pl to conformtest.py had increased conform/ test time, possibly because of increased startup overhead for Python scripts. This patch improves conformtest.py performance by arranging for as many tests of a (header, standard) pair as possible to use a single execution of the compiler, so it does not need to initialize and parse the whole header under test separately for every test assertion. Specifically, compilation tests that are not marked as "optional" or "xfail" are combined into a single source file, and are only then run separately if compilation of that combined file fails. For me, this reduces the wall clock time for the conformtest.py tests (not the whole of the conform/ directory) from two minutes to 15 seconds. Tested for x86_64, and with build-many-glibcs.py. * conform/conformtest.py (CompileSubTest.__init__): Set self.run_early to False. (ExecuteSubTest.__init__): Likewise. (HeaderTests.run): Try running all non-optional, non-XFAILed compilation tests in a single execution of the compiler. --- conform/conformtest.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'conform') diff --git a/conform/conformtest.py b/conform/conformtest.py index e86f247..31642c1 100644 --- a/conform/conformtest.py +++ b/conform/conformtest.py @@ -33,6 +33,7 @@ class CompileSubTest(object): def __init__(self, name, text): """Initialize a CompileSubTest object.""" + self.run_early = False self.name = name self.text = text @@ -46,6 +47,7 @@ class ExecuteSubTest(object): def __init__(self, name, text): """Initialize an ExecuteSubTest object.""" + self.run_early = False self.name = name self.text = text @@ -660,6 +662,21 @@ class HeaderTests(object): available = self.compile_test('Availability of <%s>' % self.header, '') if available: + # As an optimization, try running all non-optional, + # non-XFAILed compilation tests in a single execution + # of the compiler. + combined_list = [] + for test in self.tests: + if not test.optional and not test.xfail: + for subtest in test.subtests: + if isinstance(subtest, CompileSubTest): + combined_list.append(subtest.text) + subtest.run_early = True + combined_ok = self.compile_test('Combined <%s> test' + % self.header, + '\n'.join(combined_list)) + # Now run the other tests, or all tests if the + # combined test failed. for test in self.tests: # A test may run more than one subtest. If the # initial subtest for an optional symbol fails, @@ -673,7 +690,12 @@ class HeaderTests(object): self.group_ignore = False self.group_skip = False for subtest in test.subtests: - subtest.run(self) + if combined_ok and subtest.run_early: + self.total += 1 + print('PASSCOMBINED: %s' % subtest.name) + sys.stdout.flush() + else: + subtest.run(self) namespace_name = 'Namespace of <%s>' % self.header if available: self.check_namespace(namespace_name) -- cgit v1.1