[Git][ghc/ghc][wip/T18144] fix up testsuite

[Matthew Craven (@clyring)]

Matthew Craven pushed to branch wip/T18144 at Glasgow Haskell Compiler / GHC


Commits:
775e5752 by Matthew Craven at 2025-02-28T14:52:07-05:00
fix up testsuite

 * Add new output for CountDepsAst and CountDepsParser
 * Run T20275 with optimizations:
     This is the original reproducer for #25771
 * Add dedicated test for #25771

- - - - -


7 changed files:

- compiler/GHC/Cmm/Parser.y
- + testsuite/tests/cmm/opt/T25771.cmm
- + testsuite/tests/cmm/opt/T25771.stderr
- testsuite/tests/cmm/opt/all.T
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/count-deps/CountDepsAst.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout


Changes:

=====================================
compiler/GHC/Cmm/Parser.y
=====================================
@@ -1136,7 +1136,10 @@ machOps = listToUFM $
         ( "f2i32",    mk_op (flip MO_FS_Truncate W32) ),
         ( "f2i64",    mk_op (flip MO_FS_Truncate W64) ),
         ( "i2f32",    mk_op (flip MO_SF_Round W32) ),
-        ( "i2f64",    mk_op (flip MO_SF_Round W64) )
+        ( "i2f64",    mk_op (flip MO_SF_Round W64) ),
+
+        ( "w2f_bitcast", mk_op (MO_WF_Bitcast) ),
+        ( "f2w_bitcast", mk_op (MO_FW_Bitcast) )
         ]
   where mk_op :: forall (arity :: Natural). (KnownNat arity, arity > 0, arity < 4)
               => (Width -> MachOp arity) -> WidthToMachOpWithArity


=====================================
testsuite/tests/cmm/opt/T25771.cmm
=====================================
@@ -0,0 +1,8 @@
+// The point of this test is that the bitcast operations
+// should be successfully constant-folded, without panicking.
+
+func (float64 x) {
+  x = %fadd(x, %w2f_bitcast(0x4028b0a3d70a3d71 :: bits64));
+  x = %fadd(x, %f2f64(%w2f_bitcast(0x3f2a0000 :: bits32)));
+  return (x);
+}


=====================================
testsuite/tests/cmm/opt/T25771.stderr
=====================================
@@ -0,0 +1,19 @@
+
+==================== Optimised Cmm ====================
+func() { //  [D1]
+        { []
+        }
+    {offset
+      c2: // global
+          //tick src<T25771.cmm:(4,18)-(8,1)>
+          //tick src<T25771.cmm:5:5-59>
+          //tick src<T25771.cmm:6:5-59>
+          _c1::F64 = D1;   // CmmAssign
+          _c1::F64 = %MO_F_Add_W64(D1, 12.345 :: W64);   // CmmAssign
+          D1 = %MO_F_Add_W64(_c1::F64,
+                             %MO_FF_Conv_W32_W64(0.6640625 :: W32));   // CmmAssign
+          call (P64[Sp])(D1) args: 8, res: 0, upd: 8;   // CmmCall
+    }
+}
+
+


=====================================
testsuite/tests/cmm/opt/all.T
=====================================
@@ -8,3 +8,8 @@ test('T20142', normal, compile, [''])
 # We check this by telling the assembler to exit on warnings.
 test('T24556', [only_ways('optasm'), cmm_src], compile, ['-O -opta -Xassembler -opta --fatal-warnings'])
 
+test('T25771', [cmm_src, only_ways(['optasm']),
+                grep_errmsg(r'(12\.345|0\.6640625)',[1]),
+                ],
+     compile, ['-ddump-cmm-opt'])
+


=====================================
testsuite/tests/codeGen/should_run/all.T
=====================================
@@ -210,7 +210,10 @@ test('T16846', [only_ways(['optasm']), exit_code(1)], compile_and_run, [''])
 test('T17920', [cmm_src], compile_and_run, [''])
 test('T18527', req_c, compile_and_run, ['T18527FFI.c'])
 test('T19149', [req_c,only_ways('sanity')], compile_and_run, ['T19149_c.c'])
-test('T20275', normal, compile_and_run, [''])
+
+test('T20275', [extra_ways(['optasm'])], compile_and_run, [''])
+               # Also tested with optimizations because
+               # that's the original reproducer for #25771
 
 test('CallConv', [when(unregisterised(), skip),
                   unless(arch('x86_64') or arch('aarch64'), skip),


=====================================
testsuite/tests/count-deps/CountDepsAst.stdout
=====================================
@@ -76,6 +76,7 @@ GHC.Data.Maybe
 GHC.Data.OrdList
 GHC.Data.OsPath
 GHC.Data.Pair
+GHC.Data.SizedTupleGADT
 GHC.Data.SmallArray
 GHC.Data.Strict
 GHC.Data.StringBuffer


=====================================
testsuite/tests/count-deps/CountDepsParser.stdout
=====================================
@@ -78,6 +78,7 @@ GHC.Data.Maybe
 GHC.Data.OrdList
 GHC.Data.OsPath
 GHC.Data.Pair
+GHC.Data.SizedTupleGADT
 GHC.Data.SmallArray
 GHC.Data.Strict
 GHC.Data.StringBuffer



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/775e575237db5f98f7495a766104eacfc650568e
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/20250228/a2b836d0/attachment-0001.html>