[Git][ghc/ghc][wip/js-staging] Disable HPC tests with JS backend

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
c2991bc0 by Sylvain Henry at 2022-09-26T13:54:32+02:00
Disable HPC tests with JS backend

- - - - -


1 changed file:

- testsuite/config/ghc


Changes:

=====================================
testsuite/config/ghc
=====================================
@@ -8,16 +8,17 @@ import re
 #
 config.compiler_always_flags = ghc_compiler_always_flags.split()
 
-# By default, the 'normal' and 'hpc' ways are enabled. In addition, certain
+# By default, the 'normal' way is enabled. In addition, certain
 # ways are enabled automatically if this GHC supports them. Ways that fall in
-# this group are 'optasm', 'optllvm', 'profasm', 'threaded1', 'threaded2',
+# this group are 'hpc', 'optasm', 'optllvm', 'profasm', 'threaded1', 'threaded2',
 # 'profthreaded', 'ghci', and whichever of 'static/dyn' is not this GHC's
 # default mode. Other ways should be set explicitly from .T files.
-config.compile_ways       = ['normal', 'hpc']
-config.run_ways           = ['normal', 'hpc']
+config.compile_ways       = ['normal']
+config.run_ways           = ['normal']
 
 # ways that are not enabled by default, but can always be invoked explicitly
-config.other_ways         = ['prof', 'normal_h',
+config.other_ways         = ['hpc',
+                             'prof', 'normal_h',
                              'prof_hc_hb','prof_hb',
                              'prof_hd','prof_hy','prof_hr',
                              'sanity',
@@ -34,6 +35,7 @@ config.other_ways         = ['prof', 'normal_h',
                              'compacting_gc',
                              ]
 
+
 if ghc_with_native_codegen:
     config.compile_ways.append('optasm')
     config.run_ways.append('optasm')
@@ -65,6 +67,16 @@ if windows:
     else:
         config.other_ways += winio_ways
 
+# LLVM
+if not config.unregisterised and not config.arch == "js" and config.have_llvm:
+    config.compile_ways.append('optllvm')
+    config.run_ways.append('optllvm')
+
+# HPC
+if not config.arch == "js":
+    config.compile_ways.append('hpc')
+    config.run_ways.append('hpc')
+
 config.way_flags = {
     'normal'       : [],
     'normal_h'     : [],
@@ -180,15 +192,6 @@ llvm_ways     = [x[0] for x in config.way_flags.items()
 
 
 def get_compiler_info():
-    if config.unregisterised:
-        print("Unregisterised build; skipping LLVM ways...")
-    elif config.arch == "js":
-        print("JavaScript backend; skipping LLVM ways...")
-    elif config.have_llvm:
-        config.compile_ways.append('optllvm')
-        config.run_ways.append('optllvm')
-    else:
-        print("Failed to find `llc` command; skipping LLVM ways...")
 
     # Whether GHC itself was built using the LLVM backend. We need to know this
     # since some tests in ext-interp fail when stage2 ghc is built using



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c2991bc0e278b19d1a6174fb3002c0066bce1b54

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c2991bc0e278b19d1a6174fb3002c0066bce1b54
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/20220926/e778f755/attachment-0001.html>