[commit: ghc] wip/dwarf-bindists, wip/pare-down-ci, wip/std-hdr-llf, wip/test-hadrian-caching, wip/validate-ci, wip/zip7-fusion: Test bit-manipulating primops under respective arch flags like -msse4.2 (2e96ce1)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branches: wip/dwarf-bindists,wip/pare-down-ci,wip/std-hdr-llf,wip/test-hadrian-caching,wip/validate-ci,wip/zip7-fusion
Link       : http://ghc.haskell.org/trac/ghc/changeset/2e96ce1fced5ea4f005edea2eeab50f67acb9114/ghc

>---------------------------------------------------------------

commit 2e96ce1fced5ea4f005edea2eeab50f67acb9114
Author: Dmitry Ivanov <ethercrow at gmail.com>
Date:   Sun Feb 17 16:40:19 2019 +0100

    Test bit-manipulating primops under respective arch flags like -msse4.2


>---------------------------------------------------------------

2e96ce1fced5ea4f005edea2eeab50f67acb9114
 testsuite/driver/cpu_features.py                   |   4 +-
 testsuite/tests/codeGen/should_run/all.T           |   3 +-
 testsuite/tests/codeGen/should_run/cgrun077.hs     | 107 +++++++++++++++++++++
 .../{cgrun072.stdout => cgrun077.stdout}           |   3 +
 4 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/testsuite/driver/cpu_features.py b/testsuite/driver/cpu_features.py
index 7716306..7b4340b 100644
--- a/testsuite/driver/cpu_features.py
+++ b/testsuite/driver/cpu_features.py
@@ -54,12 +54,10 @@ def have_cpu_feature(feature):
     A testsuite predicate for testing the availability of CPU features.
     """
     assert feature in SUPPORTED_CPU_FEATURES
+    global cpu_feature_cache
     if cpu_feature_cache is None:
         cpu_feature_cache = get_cpu_features()
         print('Found CPU features:', ' '.join(cpu_feature_cache))
-        # Sanity checking
-        assert all(feat in SUPPORTED_CPU_FEATURES
-                   for feat in cpu_feature_cache)
 
     return feature in cpu_feature_cache
 
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 7f976b8..c6a6b27 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -78,10 +78,11 @@ test('cgrun069',
      multi_compile_and_run,
      ['cgrun069', [('cgrun069_cmm.cmm', '')], ''])
 test('cgrun070', normal, compile_and_run, [''])
-test('cgrun071', normal, compile_and_run, [''])
+test('cgrun071', [when(have_cpu_feature('sse4_2'), extra_hc_opts('-msse4.2'))], compile_and_run, [''])
 test('cgrun072', normal, compile_and_run, [''])
 test('cgrun075', normal, compile_and_run, [''])
 test('cgrun076', normal, compile_and_run, [''])
+test('cgrun077', [when(have_cpu_feature('bmi2'), extra_hc_opts('-mbmi2'))], compile_and_run, [''])
 
 test('T1852', normal, compile_and_run, [''])
 test('T1861', extra_run_opts('0'), compile_and_run, [''])
diff --git a/testsuite/tests/codeGen/should_run/cgrun077.hs b/testsuite/tests/codeGen/should_run/cgrun077.hs
new file mode 100644
index 0000000..2058ad7
--- /dev/null
+++ b/testsuite/tests/codeGen/should_run/cgrun077.hs
@@ -0,0 +1,107 @@
+{-# LANGUAGE BangPatterns, CPP, MagicHash #-}
+
+module Main ( main ) where
+
+import Data.Bits
+import GHC.Prim
+import GHC.Word
+
+#include "MachDeps.h"
+
+main = putStr
+       (test_lzCnt ++ "\n"
+        ++ test_lzCnt8 ++ "\n"
+        ++ test_lzCnt16 ++ "\n"
+        ++ test_lzCnt32 ++ "\n"
+        ++ test_lzCnt64 ++ "\n"
+        ++ "\n"
+        ++ test_tzCnt ++ "\n"
+        ++ test_tzCnt8 ++ "\n"
+        ++ test_tzCnt16 ++ "\n"
+        ++ test_tzCnt32 ++ "\n"
+        ++ test_tzCnt64 ++ "\n"
+        ++ "\n"
+       )
+
+lzcnt :: Word -> Word
+lzcnt (W# w#) = W# (clz# w#)
+
+lzcnt8 :: Word -> Word
+lzcnt8 (W# w#) = W# (clz8# w#)
+
+lzcnt16 :: Word -> Word
+lzcnt16 (W# w#) = W# (clz16# w#)
+
+lzcnt32 :: Word -> Word
+lzcnt32 (W# w#) = W# (clz32# w#)
+
+lzcnt64 :: Word64 -> Word
+lzcnt64 (W64# w#) =
+#if SIZEOF_HSWORD == 4
+    W# (clz64# w#)
+#else
+    W# (clz# w#)
+#endif
+
+lzcnt_slow :: Int -> Word -> Word
+lzcnt_slow size x = fromIntegral $ min size $ length $ takeWhile (== False) $ reverse $ map (testBit x) [0 .. size - 1]
+
+tzcnt :: Word -> Word
+tzcnt (W# w#) = W# (ctz# w#)
+
+tzcnt8 :: Word -> Word
+tzcnt8 (W# w#) = W# (ctz8# w#)
+
+tzcnt16 :: Word -> Word
+tzcnt16 (W# w#) = W# (ctz16# w#)
+
+tzcnt32 :: Word -> Word
+tzcnt32 (W# w#) = W# (ctz32# w#)
+
+tzcnt64 :: Word64 -> Word
+tzcnt64 (W64# w#) =
+#if SIZEOF_HSWORD == 4
+    W# (ctz64# w#)
+#else
+    W# (ctz# w#)
+#endif
+
+tzcnt_slow :: Int -> Word -> Word
+tzcnt_slow size x = fromIntegral $ min size $ length $ takeWhile (== False) $ map (testBit x) [0 .. size - 1]
+
+test_lzCnt = test "lzcnt" lzcnt (lzcnt_slow (8 * SIZEOF_HSWORD))
+test_lzCnt8 = test "lzcnt8" lzcnt8 (lzcnt_slow 8 . fromIntegral . (mask 8 .&.))
+test_lzCnt16 = test "lzcnt16" lzcnt16 (lzcnt_slow 16 . fromIntegral . (mask 16 .&.))
+test_lzCnt32 = test "lzcnt32" lzcnt32 (lzcnt_slow 32 . fromIntegral . (mask 32 .&.))
+test_lzCnt64 = test "lzcnt64" lzcnt64 (lzcnt_slow 64 . fromIntegral . (mask 64 .&.))
+
+test_tzCnt = test "tzcnt" tzcnt (tzcnt_slow (8 * SIZEOF_HSWORD))
+test_tzCnt8 = test "tzcnt8" tzcnt8 (tzcnt_slow 8 . fromIntegral . (mask 8 .&.))
+test_tzCnt16 = test "tzcnt16" tzcnt16 (tzcnt_slow 16 . fromIntegral . (mask 16 .&.))
+test_tzCnt32 = test "tzcnt32" tzcnt32 (tzcnt_slow 32 . fromIntegral . (mask 32 .&.))
+test_tzCnt64 = test "tzcnt64" tzcnt64 (tzcnt_slow 64 . fromIntegral . (mask 64 .&.))
+
+mask n = (2 ^ n) - 1
+
+test :: (Show a, Num a) => String -> (a -> Word) -> (a -> Word) -> String
+test name fast slow = case failing of
+    [] -> "OK"
+    ((_, e, a, i):xs) ->
+        "FAIL " ++ name ++ "\n" ++ "   Input: " ++ show i ++ "\nExpected: " ++ show e ++
+        "\n  Actual: " ++ show a
+  where
+    failing = dropWhile ( \(b,_,_,_) -> b)
+              . map (\ x -> (slow x == fast x, slow x, fast x, x)) $ cases
+    expected = map slow cases
+    actual = map fast cases
+#if SIZEOF_HSWORD == 4
+    cases = [0, 1, 2, 1480294021,1626858410,2316287658,1246556957,3806579062,65945563,
+             1521588071,791321966,1355466914,2284998160]
+#elif SIZEOF_HSWORD == 8
+    cases = [0, 1, 2, 11004539497957619752,5625461252166958202,1799960778872209546,
+             16979826074020750638,12789915432197771481,11680809699809094550,
+             13208678822802632247,13794454868797172383,13364728999716654549,
+             17516539991479925226]
+#else
+# error Unexpected word size
+#endif
diff --git a/testsuite/tests/codeGen/should_run/cgrun072.stdout b/testsuite/tests/codeGen/should_run/cgrun077.stdout
similarity index 84%
copy from testsuite/tests/codeGen/should_run/cgrun072.stdout
copy to testsuite/tests/codeGen/should_run/cgrun077.stdout
index 6bf2504..7faabe0 100644
--- a/testsuite/tests/codeGen/should_run/cgrun072.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun077.stdout
@@ -3,7 +3,10 @@ OK
 OK
 OK
 OK
+
 OK
 OK
 OK
 OK
+OK
+