[Git][ghc/ghc][wip/backports-9.10] Partially revert "testsuite: expand size testing infrastructure"
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Tue Mar 4 22:18:00 UTC 2025
Ben Gamari pushed to branch wip/backports-9.10 at Glasgow Haskell Compiler / GHC
Commits:
457055f8 by Ben Gamari at 2025-03-04T17:02:00-05:00
Partially revert "testsuite: expand size testing infrastructure"
This reverts the size testing infrastructure from commit
a15b3383c95864eb1ca9df4f7065ef6f6fe84393 as it has broken the testsuite.
- - - - -
3 changed files:
- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- testsuite/tests/perf/size/all.T
Changes:
=====================================
testsuite/driver/testglobals.py
=====================================
@@ -223,10 +223,6 @@ class TestConfig:
# I have no idea what this does
self.package_conf_cache_file = None # type: Optional[Path]
- # the libdir for the test compiler. Set by hadrian, see
- # Setting.Builders.RunTest
- self.libdir = ''
-
# The extra hadrian dependencies we need for all configured tests
self.hadrian_deps = set() # type: Set[str]
=====================================
testsuite/driver/testlib.py
=====================================
@@ -628,24 +628,15 @@ def collect_size ( deviation, path ):
def get_dir_size(path):
total = 0
- try:
- with os.scandir(path) as it:
- for entry in it:
- if entry.is_file():
- total += entry.stat().st_size
- elif entry.is_dir():
- total += get_dir_size(entry.path)
- return total
- except FileNotFoundError:
- print("Exception: Could not find: " + path)
+ with os.scandir(path) as it:
+ for entry in it:
+ if entry.is_file():
+ total += entry.stat().st_size
+ elif entry.is_dir():
+ total += get_dir_size(entry.path)
+ return total
def collect_size_dir ( deviation, path ):
-
- ## os.path.join joins the path with slashes (not backslashes) on windows
- ## CI...for some reason, so we manually detect it here
- sep = r"/"
- if on_windows():
- sep = r"\\"
return collect_generic_stat ( 'size', deviation, lambda way: get_dir_size(path) )
# Read a number from a specific file
@@ -662,92 +653,7 @@ def collect_generic_stats ( metric_info ):
return _collect_generic_stat(name, opts, metric_info)
return f
-# wrap the call to collect_size_dir with path_from_ghcPkg in a function. Python
-# is call-by-value so if we placed the call in an all.T file then the python
-# interpreter would evaluate the call to path_from_ghcPkg
-def collect_size_ghc_pkg (deviation, library):
- return collect_size_dir(deviation, path_from_ghcPkg(library, "library-dirs"))
-
-# same for collect_size and find_so
-def collect_object_size (deviation, library, use_non_inplace=False):
- if use_non_inplace:
- return collect_size(deviation, find_non_inplace_so(library))
- else:
- return collect_size(deviation, find_so(library))
-
-def path_from_ghcPkg (library, field):
- """Find the field as a path for a library via a call to ghc-pkg. This is a
- testsuite wrapper around a call to ghc-pkg field {library} {field}.
- """
-
- ### example output from ghc-pkg:
- ### $ ./ghc-pkg field Cabal library-dirs
- ### library-dirs: /home/doyougnu/programming/haskell/ghc/_build/stage1/lib/../lib/x86_64-linux-ghc-9.11.20240424/Cabal-3.11.0.0-inplace
- ### so we split the string and drop the 'library-dirs'
- ghcPkgCmd = fr"{config.ghc_pkg} field {library} {field}"
-
- try:
- result = subprocess.run(ghcPkgCmd, capture_output=True, shell=True)
-
- # check_returncode throws an exception if the return code is not 0.
- result.check_returncode()
-
- # if we get here then the call worked and we have the path we split by
- # whitespace and then return the path which becomes the second element
- # in the array
- return re.split(r'\s+', result.stdout.decode("utf-8"))[1]
- except Exception as e:
- message = f"""
- Attempt to find {field} of {library} using ghc-pkg failed.
- ghc-pkg path: {config.ghc_pkg}
- error" {e}
- """
- print(message)
-
-
-def _find_so(lib, directory, in_place):
- """Find a shared object file (.so) for lib in directory. We deliberately
- keep the regex simple, just removing the ghc version and project version.
- Example:
-
- _find_so("Cabal-syntax-3.11.0.0", path-from-ghc-pkg, True) ==>
- /builds/ghc/ghc/_build/install/lib/ghc-9.11.20240410/lib/x86_64-linux-ghc-9.11.20240410/libHSCabal-syntax-3.11.0.0-inplace-ghc9.11.20240410.so
- """
-
- # produce the suffix for the CI operating system
- suffix = "so"
- if config.os == "mingw32":
- suffix = "dll"
- elif config.os == "darwin":
- suffix = "dylib"
-
- # Most artfacts are of the form foo-inplace, except for the rts.
- if in_place:
- to_match = r'libHS{}-\d+(\.\d+)+-inplace-\S+\.' + suffix
- else:
- to_match = r'libHS{}-\d+(\.\d+)+\S+\.' + suffix
-
- matches = []
- # wrap this in some exception handling, hadrian test will error out because
- # these files don't exist yet, so we pass when this occurs
- try:
- for f in os.listdir(directory):
- if f.endswith(suffix):
- pattern = re.compile(to_match.format(re.escape(lib)))
- match = re.match(pattern, f)
- if match:
- matches.append(match.group())
- return os.path.join(directory, matches[0])
- except:
- failBecause('Could not find shared object file: ' + lib)
-
-def find_so(lib):
- return _find_so(lib,path_from_ghcPkg(lib, "dynamic-library-dirs"),True)
-
-def find_non_inplace_so(lib):
- return _find_so(lib,path_from_ghcPkg(lib, "dynamic-library-dirs"),False)
-
-# Define a generic stat test, which computes the statistic by calling the function
+# Define the a generic stat test, which computes the statistic by calling the function
# given as the third argument.
def collect_generic_stat ( metric, deviation, get_stat ):
return collect_generic_stats ( { metric: { 'deviation': deviation, 'current': get_stat } } )
=====================================
testsuite/tests/perf/size/all.T
=====================================
@@ -3,80 +3,4 @@ test('size_hello_obj', [collect_size(5, 'size_hello_obj.o')], compile, [''])
test('size_hello_artifact', [collect_size(5, 'size_hello_artifact' + exe_extension())],
compile_artifact, [''])
-size_acceptance_threshold = 100
-
-test('array_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'array')] , static_stats , [] )
-test('base_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'base')] , static_stats , [] )
-test('binary_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'binary')] , static_stats , [] )
-test('bytestring_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'bytestring')] , static_stats , [] )
-test('cabal_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'Cabal')] , static_stats , [] )
-test('cabal_syntax_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'Cabal-syntax')] , static_stats , [] )
-test('containers_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'containers')] , static_stats , [] )
-test('deepseq_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'deepseq')] , static_stats , [] )
-test('directory_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'directory')] , static_stats , [] )
-test('exceptions_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'exceptions')] , static_stats , [] )
-test('ghc_bignum_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-bignum')] , static_stats , [] )
-test('ghc_boot_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-boot')] , static_stats , [] )
-test('ghc_boot_th_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-boot-th')] , static_stats , [] )
-test('ghc_compact_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-compact')] , static_stats , [] )
-test('ghc_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc')] , static_stats , [] )
-test('ghc_experimental_dir',[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-experimental')], static_stats , [] )
-test('ghc_heap_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-heap')] , static_stats , [] )
-test('ghc_internal_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-internal')] , static_stats , [] )
-test('ghc_platform_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-platform')] , static_stats , [] )
-test('ghc_prim_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-prim')] , static_stats , [] )
-test('ghc_toolchain_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'ghc-toolchain')] , static_stats , [] )
-test('haskeline_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'haskeline')] , static_stats , [] )
-test('hpc_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'hpc')] , static_stats , [] )
-test('integer_gmp_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'integer-gmp')] , static_stats , [] )
-test('mtl_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'mtl')] , static_stats , [] )
-test('os_string_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'os-string')] , static_stats , [] )
-test('parsec_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'parsec')] , static_stats , [] )
-test('pretty_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'pretty')] , static_stats , [] )
-test('process_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'process')] , static_stats , [] )
-test('time_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'time')] , static_stats , [] )
-test('xhtml_dir' ,[collect_size_ghc_pkg(size_acceptance_threshold , 'xhtml')] , static_stats , [] )
-
-# size of the entire libdir
-test('libdir' ,[collect_size_dir(10, config.libdir)] , static_stats , [] )
-
-# skip these on windows
-test('unix_dir' ,[windows_skip, collect_size_ghc_pkg(size_acceptance_threshold, 'unix')] , static_stats, [] )
-test('terminfo_dir' ,[windows_skip, js_skip, collect_size_ghc_pkg(size_acceptance_threshold, 'terminfo')], static_stats, [] )
-
-# skip the shared object file tests on windows
-test('array_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "array")] , static_stats, [] )
-test('base_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "base")] , static_stats, [] )
-test('binary_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "binary")] , static_stats, [] )
-test('bytestring_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "bytestring")] , static_stats, [] )
-test('cabal_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "Cabal")] , static_stats, [] )
-test('cabal_syntax_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "Cabal-syntax")] , static_stats, [] )
-test('containers_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "containers")] , static_stats, [] )
-test('deepseq_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "deepseq")] , static_stats, [] )
-test('directory_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "directory")] , static_stats, [] )
-test('exceptions_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "exceptions")] , static_stats, [] )
-test('filepath_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "filepath")] , static_stats, [] )
-test('ghc_bignum_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-bignum")] , static_stats, [] )
-test('ghc_boot_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-boot")] , static_stats, [] )
-test('ghc_boot_th_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-boot-th")] , static_stats, [] )
-test('ghc_experimental_so',[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-experimental")] , static_stats, [] )
-test('ghc_heap_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-heap")] , static_stats, [] )
-test('ghc_platform_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-platform")] , static_stats, [] )
-test('ghc_prim_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-prim")] , static_stats, [] )
-test('ghc_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc")] , static_stats, [] )
-test('ghc_toolchain_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghc-toolchain")] , static_stats, [] )
-test('ghci_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "ghci")] , static_stats, [] )
-test('haskeline_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "haskeline")] , static_stats, [] )
-test('hpc_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "hpc")] , static_stats, [] )
-test('mtl_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "mtl")] , static_stats, [] )
-test('os_string_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "os-string")] , static_stats, [] )
-test('parsec_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "parsec")] , static_stats, [] )
-test('process_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "process")] , static_stats, [] )
-# Disabled as extremely unstable
-#test('rts_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "rts", True)] , static_stats, [] )
-test('template_haskell_so',[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "template-haskell")] , static_stats, [] )
-test('terminfo_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "terminfo")] , static_stats, [] )
-test('text_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "text")] , static_stats, [] )
-test('time_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "time")] , static_stats, [] )
-test('transformers_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "transformers")] , static_stats, [] )
-test('xhtml_so' ,[req_dynamic_ghc, js_skip, windows_skip, collect_object_size(size_acceptance_threshold, "xhtml")] , static_stats, [] )
+test('libdir',[collect_size_dir(10, config.libdir)], static_stats, [] )
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/457055f8a746191acea5537f737cbd459a6acd5e
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/457055f8a746191acea5537f737cbd459a6acd5e
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250304/8bfac929/attachment-0001.html>
More information about the ghc-commits
mailing list