Revert "Add support for SIMD operations in the NCG"

Unfortunately this will require more work; register allocation is
quite broken.

This reverts commit acd795583625401c5554f8e04ec7efca18814011.

15 files changed, 1 insertions, 459 deletions

diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index eb6fee544f..20ac9cc59e 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -80,20 +80,11 @@ test('cgrun069',
 test('cgrun070', 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('cgrun074', 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('cgrun078', omit_ways(['ghci']), compile_and_run, [''])
 
-# N.B. Only NCG and LLVM backends support SIMD operations
-test('simd000', when(unregisterised(), skip), compile_and_run, [''])
-test('simd001', when(unregisterised(), skip), compile_and_run, [''])
-test('simd002', when(unregisterised(), skip), compile_and_run, [''])
-test('simd003', when(unregisterised(), skip), compile_and_run, [''])
-test('simd004', when(unregisterised(), skip), compile_and_run, [''])
-test('simd005', when(unregisterised(), skip), compile_and_run, [''])
-
 test('T1852', normal, compile_and_run, [''])
 test('T1861', extra_run_opts('0'), compile_and_run, [''])
 test('T2080', normal, compile_and_run, [''])
@@ -152,6 +143,7 @@ test('T9001', normal, compile_and_run, [''])
 test('T9013', omit_ways(['ghci']),  # ghci doesn't support unboxed tuples
      compile_and_run, [''])
 test('T9340', normal, compile_and_run, [''])
+test('cgrun074', normal, compile_and_run, [''])
 test('CmmSwitchTest32', unless(wordsize(32), skip), compile_and_run, [''])
 test('CmmSwitchTest64', unless(wordsize(64), skip), compile_and_run, [''])
 # Skipping WAY=ghci, because it is not broken.
diff --git a/testsuite/tests/codeGen/should_run/cgrun083.hs b/testsuite/tests/codeGen/should_run/cgrun083.hs
deleted file mode 100644
index cac889ec02..0000000000
--- a/testsuite/tests/codeGen/should_run/cgrun083.hs
+++ /dev/null
@@ -1,70 +0,0 @@
-{-# OPTIONS_GHC -O2 #-}
-{-# OPTIONS_GHC -msse #-}
-{-# OPTIONS_GHC -msse2 #-}
-{-# OPTIONS_GHC -msse4 #-}
-{-# LANGUAGE MagicHash #-}
-{-# LANGUAGE UnboxedTuples #-}
--- tests for SSE based vector load/stores operations
-
-import GHC.Exts
-import GHC.IO
-
-data ByteArray = BA (MutableByteArray# RealWorld)
-
-data FloatX4  = FX4# FloatX4#
-
-instance Show FloatX4 where
-  show (FX4# f) = case (unpackFloatX4# f) of
-    (# a, b, c, d #) -> show ((F# a), (F# b), (F# c), (F# d))
-
-
-instance Eq FloatX4 where
-  (FX4# a) == (FX4# b)
-    = case (unpackFloatX4# a) of
-        (# a1, a2, a3, a4 #) ->
-          case (unpackFloatX4# b) of
-            (# b1, b2, b3, b4 #) -> (F# a1) == (F# b1) &&
-                                    (F# a2) == (F# b2) &&
-                                    (F# a3) == (F# b3) &&
-                                    (F# a4) == (F# b4)
-
-data DoubleX2 = DX2# DoubleX2#
-
-instance Show DoubleX2 where
-  show (DX2# d) = case (unpackDoubleX2# d) of
-    (# a, b #) -> show ((D# a), (D# b))
-
-
-instance Eq DoubleX2 where
-  (DX2# a) == (DX2# b)
-    = case (unpackDoubleX2# a) of
-        (# a1, a2 #) ->
-          case (unpackDoubleX2# b) of
-            (# b1, b2 #) -> (D# a1) == (D# b1) &&
-                            (D# a2) == (D# b2)
-
-writeFloatArray :: ByteArray -> Int -> Float -> IO ()
-writeFloatArray (BA ba) (I# i) (F# n) = IO $ \s ->
-    case writeFloatArray# ba i n s of s' -> (# s', () #)
-
-readFloatX4 :: ByteArray -> Int -> IO FloatX4
-readFloatX4 (BA ba) (I# i) = IO $ \s ->
-    case readFloatArrayAsFloatX4# ba i s of (# s', r #) -> (# s', FX4# r #)
-
-writeDoubleArray :: ByteArray -> Int -> Double -> IO ()
-writeDoubleArray (BA ba) (I# i) (D# n) = IO $ \s ->
-    case writeDoubleArray# ba i n s of s' -> (# s', () #)
-
-readDoubleX2 :: ByteArray -> Int -> IO DoubleX2
-readDoubleX2 (BA ba) (I# i) = IO $ \s ->
-    case readDoubleArrayAsDoubleX2# ba i s of (# s', r #) -> (# s', DX2# r #)
-
-main :: IO ()
-main = do
-    ba <- IO $ \s -> case newAlignedPinnedByteArray# 64# 64# s of (# s', ba #) -> (# s', BA ba #)
-
-    mapM_ (\i -> writeFloatArray ba i (realToFrac i + realToFrac i / 10)) [0..16]
-    print =<< readFloatX4 ba 0
-
-    mapM_ (\i -> writeDoubleArray ba i (realToFrac i + realToFrac i / 10)) [0..8]
-    print =<< readDoubleX2 ba 0
diff --git a/testsuite/tests/codeGen/should_run/cgrun083.stdout b/testsuite/tests/codeGen/should_run/cgrun083.stdout
deleted file mode 100644
index bc41b3d2d3..0000000000
--- a/testsuite/tests/codeGen/should_run/cgrun083.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-(0.0,1.1,2.2,3.3)
-(0.0,1.1)
diff --git a/testsuite/tests/codeGen/should_run/simd000.hs b/testsuite/tests/codeGen/should_run/simd000.hs
deleted file mode 100644
index 47d69497c0..0000000000
--- a/testsuite/tests/codeGen/should_run/simd000.hs
+++ /dev/null
@@ -1,21 +0,0 @@
-{-# OPTIONS_GHC -mavx #-}
-{-# OPTIONS_GHC -msse4 #-}
-{-# LANGUAGE MagicHash #-}
-{-# LANGUAGE UnboxedTuples #-}
--- !!! test broadcasting, packing and unpacking for vector types
-
-import GHC.Exts
-
-main :: IO ()
-main = do
-    -- FloatX4#
-    case unpackFloatX4# (broadcastFloatX4# 1.5#) of
-        (# a, b, c, d #) -> print (F# a, F# b, F# c, F# d)
-    case unpackFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #)) of
-        (# a, b, c, d #) -> print (F# a, F# b, F# c, F# d)
-
-    -- DoubleX2#
-    case unpackDoubleX2# (broadcastDoubleX2# 6.5##) of
-        (# a, b #) -> print (D# a, D# b)
-    case unpackDoubleX2# (packDoubleX2# (# 8.9##,7.2## #)) of
-        (# a, b #) -> print (D# a, D# b)
diff --git a/testsuite/tests/codeGen/should_run/simd000.stdout b/testsuite/tests/codeGen/should_run/simd000.stdout
deleted file mode 100644
index e5f9d383ec..0000000000
--- a/testsuite/tests/codeGen/should_run/simd000.stdout
+++ /dev/null
@@ -1,4 +0,0 @@
-(1.5,1.5,1.5,1.5)
-(4.5,7.8,2.3,6.5)
-(6.5,6.5)
-(8.9,7.2)
diff --git a/testsuite/tests/codeGen/should_run/simd001.hs b/testsuite/tests/codeGen/should_run/simd001.hs
deleted file mode 100644
index c45e3bf922..0000000000
--- a/testsuite/tests/codeGen/should_run/simd001.hs
+++ /dev/null
@@ -1,49 +0,0 @@
-{-# OPTIONS_GHC -mavx #-}
-{-# LANGUAGE MagicHash #-}
-{-# LANGUAGE UnboxedTuples #-}
--- !!! test the lifting of unlifted vector types and
--- defining various typeclass instances for the lifted types
-
-import GHC.Exts
-
-data FloatX4  = FX4# FloatX4#
-
-instance Show FloatX4 where
-  show (FX4# f) = case (unpackFloatX4# f) of
-    (# a, b, c, d #) -> show ((F# a), (F# b), (F# c), (F# d))
-
-
-instance Eq FloatX4 where
-  (FX4# a) == (FX4# b)
-    = case (unpackFloatX4# a) of
-        (# a1, a2, a3, a4 #) ->
-          case (unpackFloatX4# b) of
-            (# b1, b2, b3, b4 #) -> (F# a1) == (F# b1) &&
-                                    (F# a2) == (F# b2) &&
-                                    (F# a3) == (F# b3) &&
-                                    (F# a4) == (F# b4)
-
-data DoubleX2 = DX2# DoubleX2#
-
-instance Show DoubleX2 where
-  show (DX2# d) = case (unpackDoubleX2# d) of
-    (# a, b #) -> show ((D# a), (D# b))
-
-
-instance Eq DoubleX2 where
-  (DX2# a) == (DX2# b)
-    = case (unpackDoubleX2# a) of
-        (# a1, a2 #) ->
-          case (unpackDoubleX2# b) of
-            (# b1, b2 #) -> (D# a1) == (D# b1) &&
-                            (D# a2) == (D# b2)
-
-main :: IO ()
-main = do
-  print (FX4# (broadcastFloatX4# 1.5#))
-  print $ (FX4# (broadcastFloatX4# 1.5#)) == (FX4# (broadcastFloatX4# 2.5#))
-  print $ (FX4# (broadcastFloatX4# 3.5#)) == (FX4# (broadcastFloatX4# 3.5#))
-
-  print (DX2# (broadcastDoubleX2# 2.5##))
-  print $ (DX2# (broadcastDoubleX2# 1.5##)) == (DX2# (broadcastDoubleX2# 2.5##))
-  print $ (DX2# (broadcastDoubleX2# 3.5##)) == (DX2# (broadcastDoubleX2# 3.5##))
diff --git a/testsuite/tests/codeGen/should_run/simd001.stdout b/testsuite/tests/codeGen/should_run/simd001.stdout
deleted file mode 100644
index 899f900506..0000000000
--- a/testsuite/tests/codeGen/should_run/simd001.stdout
+++ /dev/null
@@ -1,6 +0,0 @@
-(1.5,1.5,1.5,1.5)
-False
-True
-(2.5,2.5)
-False
-True
diff --git a/testsuite/tests/codeGen/should_run/simd002.hs b/testsuite/tests/codeGen/should_run/simd002.hs
deleted file mode 100644
index 8c61546381..0000000000
--- a/testsuite/tests/codeGen/should_run/simd002.hs
+++ /dev/null
@@ -1,33 +0,0 @@
-{-# OPTIONS_GHC -mavx #-}
-{-# LANGUAGE MagicHash #-}
-{-# LANGUAGE UnboxedTuples #-}
--- !!! test arithmetic vector operations
-
-import GHC.Exts
-
-data FloatX4 = FX4# FloatX4#
-
-instance Show FloatX4 where
-  show (FX4# f) = case (unpackFloatX4# f) of
-    (# a, b, c, d #) -> show ((F# a), (F# b), (F# c), (F# d))
-
-data DoubleX2 = DX2# DoubleX2#
-
-instance Show DoubleX2 where
-  show (DX2# d) = case (unpackDoubleX2# d) of
-    (# a, b #) -> show ((D# a), (D# b))
-
-
-main :: IO ()
-main = do
-  print (FX4# (plusFloatX4# (broadcastFloatX4# 1.3#) (broadcastFloatX4# 2.2#)))
-  print (FX4# (minusFloatX4# (broadcastFloatX4# 3.5#) (broadcastFloatX4# 2.2#)))
-  print (FX4# (timesFloatX4# (broadcastFloatX4# 2.4#) (broadcastFloatX4# 2.2#)))
-  print (FX4# (divideFloatX4# (broadcastFloatX4# 9.2#) (broadcastFloatX4# 4.0#)))
-  print (FX4# (negateFloatX4# (broadcastFloatX4# 3.5#)))
-
-  print (DX2# (plusDoubleX2# (broadcastDoubleX2# 1.3##) (broadcastDoubleX2# 2.2##)))
-  print (DX2# (minusDoubleX2# (broadcastDoubleX2# 3.5##) (broadcastDoubleX2# 2.2##)))
-  print (DX2# (timesDoubleX2# (broadcastDoubleX2# 2.4##) (broadcastDoubleX2# 2.2##)))
-  print (DX2# (divideDoubleX2# (broadcastDoubleX2# 9.2##) (broadcastDoubleX2# 4.0##)))
-  print (DX2# (negateDoubleX2# (broadcastDoubleX2# 3.5##)))
diff --git a/testsuite/tests/codeGen/should_run/simd002.stdout b/testsuite/tests/codeGen/should_run/simd002.stdout
deleted file mode 100644
index 302d71a13f..0000000000
--- a/testsuite/tests/codeGen/should_run/simd002.stdout
+++ /dev/null
@@ -1,10 +0,0 @@
-(3.5,3.5,3.5,3.5)
-(1.3,1.3,1.3,1.3)
-(5.28,5.28,5.28,5.28)
-(2.3,2.3,2.3,2.3)
-(-3.5,-3.5,-3.5,-3.5)
-(3.5,3.5)
-(1.2999999999999998,1.2999999999999998)
-(5.28,5.28)
-(2.3,2.3)
-(-3.5,-3.5)
diff --git a/testsuite/tests/codeGen/should_run/simd003.hs b/testsuite/tests/codeGen/should_run/simd003.hs
deleted file mode 100644
index de3ae5aeb4..0000000000
--- a/testsuite/tests/codeGen/should_run/simd003.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-{-# OPTIONS_GHC -msse4 #-}
-{-# OPTIONS_GHC -mavx #-}
-{-# LANGUAGE MagicHash #-}
-{-# LANGUAGE UnboxedTuples #-}
--- !!! test the packing of floats and doubles into a vector
-
-import GHC.Exts
-
-data FloatX4 = FX4# FloatX4#
-
-instance Show FloatX4 where
-  show (FX4# f) = case (unpackFloatX4# f) of
-    (# a, b, c, d #) -> show ((F# a), (F# b), (F# c), (F# d))
-
-data DoubleX2 = DX2# DoubleX2#
-
-instance Show DoubleX2 where
-  show (DX2# d) = case (unpackDoubleX2# d) of
-    (# a, b #) -> show ((D# a), (D# b))
-
-
-main :: IO ()
-main = do
-  print (FX4# (packFloatX4# (# 9.2#, 8.15#, 7.0#, 6.4# #)))
-  print (DX2# (packDoubleX2# (# 7.2##, 9.3## #)))
diff --git a/testsuite/tests/codeGen/should_run/simd003.stdout b/testsuite/tests/codeGen/should_run/simd003.stdout
deleted file mode 100644
index 230e4658c4..0000000000
--- a/testsuite/tests/codeGen/should_run/simd003.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-(9.2,8.15,7.0,6.4)
-(7.2,9.3)
diff --git a/testsuite/tests/codeGen/should_run/simd004.hs b/testsuite/tests/codeGen/should_run/simd004.hs
deleted file mode 100644
index 5216822ec4..0000000000
--- a/testsuite/tests/codeGen/should_run/simd004.hs
+++ /dev/null
@@ -1,95 +0,0 @@
-{-# OPTIONS_GHC -O2 #-}
-{-# OPTIONS_GHC -mavx #-}
-{-# OPTIONS_GHC -msse4 #-}
-{-# LANGUAGE MagicHash #-}
-{-# LANGUAGE UnboxedTuples #-}
--- !!! test if enabling -O2 produces wrong results while
---     packing , broadcasting, unpacking vectors and for
---     arithmetic operations as well for avx instructions
-
-import GHC.Exts
-
-data FloatX4  = FX4# FloatX4#
-
-instance Show FloatX4 where
-  show (FX4# f) = case (unpackFloatX4# f) of
-    (# a, b, c, d #) -> show ((F# a), (F# b), (F# c), (F# d))
-
-
-instance Eq FloatX4 where
-  (FX4# a) == (FX4# b)
-    = case (unpackFloatX4# a) of
-        (# a1, a2, a3, a4 #) ->
-          case (unpackFloatX4# b) of
-            (# b1, b2, b3, b4 #) -> (F# a1) == (F# b1) &&
-                                    (F# a2) == (F# b2) &&
-                                    (F# a3) == (F# b3) &&
-                                    (F# a4) == (F# b4)
-
-data DoubleX2 = DX2# DoubleX2#
-
-instance Show DoubleX2 where
-  show (DX2# d) = case (unpackDoubleX2# d) of
-    (# a, b #) -> show ((D# a), (D# b))
-
-
-instance Eq DoubleX2 where
-  (DX2# a) == (DX2# b)
-    = case (unpackDoubleX2# a) of
-        (# a1, a2 #) ->
-          case (unpackDoubleX2# b) of
-            (# b1, b2 #) -> (D# a1) == (D# b1) &&
-                            (D# a2) == (D# b2)
-
-
-main :: IO ()
-main = do
-
-    -- !!! test broadcasting, packing and unpacking for vector types
-    -- FloatX4#
-    case unpackFloatX4# (broadcastFloatX4# 1.5#) of
-        (# a, b, c, d #) -> print (F# a, F# b, F# c, F# d)
-    case unpackFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #)) of
-        (# a, b, c, d #) -> print (F# a, F# b, F# c, F# d)
-
-    -- DoubleX2#
-    case unpackDoubleX2# (broadcastDoubleX2# 6.5##) of
-        (# a, b #) -> print (D# a, D# b)
-    case unpackDoubleX2# (packDoubleX2# (# 8.9##,7.2## #)) of
-        (# a, b #) -> print (D# a, D# b)
-
-
-    -- !!! test the lifting of unlifted vector types and
-    -- defining various typeclass instances for the lifted types
-
-    print (FX4# (broadcastFloatX4# 1.5#))
-    print $ (FX4# (broadcastFloatX4# 1.5#)) == (FX4# (broadcastFloatX4# 2.5#))
-    print $ (FX4# (broadcastFloatX4# 3.5#)) == (FX4# (broadcastFloatX4# 3.5#))
-
-    print (DX2# (broadcastDoubleX2# 2.5##))
-    print $ (DX2#
-             (broadcastDoubleX2# 1.5##)) == (DX2# (broadcastDoubleX2# 2.5##))
-    print $ (DX2#
-             (broadcastDoubleX2# 3.5##)) == (DX2# (broadcastDoubleX2# 3.5##))
-
-
-    -- !!! test arithmetic vector operations
-    print (FX4# (plusFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                              (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (minusFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                               (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (timesFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                               (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (divideFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                                (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (negateFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))))
-
-    print (DX2# (plusDoubleX2# (broadcastDoubleX2# 1.3##)
-                               (broadcastDoubleX2# 2.2##)))
-    print (DX2# (minusDoubleX2# (broadcastDoubleX2# 3.5##)
-                                (broadcastDoubleX2# 2.2##)))
-    print (DX2# (timesDoubleX2# (broadcastDoubleX2# 2.4##)
-                                (broadcastDoubleX2# 2.2##)))
-    print (DX2# (divideDoubleX2# (broadcastDoubleX2# 9.2##)
-                                 (broadcastDoubleX2# 4.0##)))
-    print (DX2# (negateDoubleX2# (broadcastDoubleX2# 3.5##)))
diff --git a/testsuite/tests/codeGen/should_run/simd004.stdout b/testsuite/tests/codeGen/should_run/simd004.stdout
deleted file mode 100644
index ee90e738ca..0000000000
--- a/testsuite/tests/codeGen/should_run/simd004.stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-(1.5,1.5,1.5,1.5)
-(4.5,7.8,2.3,6.5)
-(6.5,6.5)
-(8.9,7.2)
-(1.5,1.5,1.5,1.5)
-False
-True
-(2.5,2.5)
-False
-True
-(12.7,14.1,7.0,15.7)
-(-3.6999998,1.5,-2.3999999,-2.6999998)
-(36.899998,49.140003,10.809999,59.8)
-(0.5487805,1.2380953,0.4893617,0.70652175)
-(-4.5,-7.8,-2.3,-6.5)
-(3.5,3.5)
-(1.2999999999999998,1.2999999999999998)
-(5.28,5.28)
-(2.3,2.3)
-(-3.5,-3.5)
\ No newline at end of file
diff --git a/testsuite/tests/codeGen/should_run/simd005.hs b/testsuite/tests/codeGen/should_run/simd005.hs
deleted file mode 100644
index b074066d24..0000000000
--- a/testsuite/tests/codeGen/should_run/simd005.hs
+++ /dev/null
@@ -1,93 +0,0 @@
-{-# OPTIONS_GHC -O2 #-}
-{-# OPTIONS_GHC -msse #-}
-{-# OPTIONS_GHC -msse2 #-}
-{-# OPTIONS_GHC -msse4 #-}
-{-# LANGUAGE MagicHash #-}
-{-# LANGUAGE UnboxedTuples #-}
--- tests for SSE based vector operations
-
-import GHC.Exts
-
-data FloatX4  = FX4# FloatX4#
-
-instance Show FloatX4 where
-  show (FX4# f) = case (unpackFloatX4# f) of
-    (# a, b, c, d #) -> show ((F# a), (F# b), (F# c), (F# d))
-
-
-instance Eq FloatX4 where
-  (FX4# a) == (FX4# b)
-    = case (unpackFloatX4# a) of
-        (# a1, a2, a3, a4 #) ->
-          case (unpackFloatX4# b) of
-            (# b1, b2, b3, b4 #) -> (F# a1) == (F# b1) &&
-                                    (F# a2) == (F# b2) &&
-                                    (F# a3) == (F# b3) &&
-                                    (F# a4) == (F# b4)
-
-data DoubleX2 = DX2# DoubleX2#
-
-instance Show DoubleX2 where
-  show (DX2# d) = case (unpackDoubleX2# d) of
-    (# a, b #) -> show ((D# a), (D# b))
-
-
-instance Eq DoubleX2 where
-  (DX2# a) == (DX2# b)
-    = case (unpackDoubleX2# a) of
-        (# a1, a2 #) ->
-          case (unpackDoubleX2# b) of
-            (# b1, b2 #) -> (D# a1) == (D# b1) &&
-                            (D# a2) == (D# b2)
-
-main :: IO ()
-main = do
-
-    -- !!! test broadcasting, packing and unpacking for vector types
-    -- FloatX4#
-    case unpackFloatX4# (broadcastFloatX4# 1.5#) of
-        (# a, b, c, d #) -> print (F# a, F# b, F# c, F# d)
-    case unpackFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #)) of
-        (# a, b, c, d #) -> print (F# a, F# b, F# c, F# d)
-
-    -- DoubleX2#
-    case unpackDoubleX2# (broadcastDoubleX2# 6.5##) of
-        (# a, b #) -> print (D# a, D# b)
-    case unpackDoubleX2# (packDoubleX2# (# 8.9##,7.2## #)) of
-        (# a, b #) -> print (D# a, D# b)
-
-
-    -- !!! test the lifting of unlifted vector types and
-    -- defining various typeclass instances for the lifted types
-
-    print (FX4# (broadcastFloatX4# 1.5#))
-    print $ (FX4# (broadcastFloatX4# 1.5#)) == (FX4# (broadcastFloatX4# 2.5#))
-    print $ (FX4# (broadcastFloatX4# 3.5#)) == (FX4# (broadcastFloatX4# 3.5#))
-
-    print (DX2# (broadcastDoubleX2# 2.5##))
-    print $ (DX2#
-             (broadcastDoubleX2# 1.5##)) == (DX2# (broadcastDoubleX2# 2.5##))
-    print $ (DX2#
-             (broadcastDoubleX2# 3.5##)) == (DX2# (broadcastDoubleX2# 3.5##))
-
-
-    -- !!! test arithmetic vector operations
-    print (FX4# (plusFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                              (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (minusFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                               (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (timesFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                               (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (divideFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))
-                                (packFloatX4# (# 8.2#,6.3#, 4.7#, 9.2# #))))
-    print (FX4# (negateFloatX4# (packFloatX4# (# 4.5#,7.8#, 2.3#, 6.5# #))))
-
-    print (DX2# (plusDoubleX2# (broadcastDoubleX2# 1.3##)
-                               (broadcastDoubleX2# 2.2##)))
-    print (DX2# (minusDoubleX2# (broadcastDoubleX2# 3.5##)
-                                (broadcastDoubleX2# 2.2##)))
-    print (DX2# (timesDoubleX2# (broadcastDoubleX2# 2.4##)
-                                (broadcastDoubleX2# 2.2##)))
-    print (DX2# (divideDoubleX2# (broadcastDoubleX2# 9.2##)
-                                 (broadcastDoubleX2# 4.0##)))
-    print (DX2# (negateDoubleX2# (broadcastDoubleX2# 3.5##)))
diff --git a/testsuite/tests/codeGen/should_run/simd005.stdout b/testsuite/tests/codeGen/should_run/simd005.stdout
deleted file mode 100644
index 84386823f8..0000000000
--- a/testsuite/tests/codeGen/should_run/simd005.stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-(1.5,1.5,1.5,1.5)
-(4.5,7.8,2.3,6.5)
-(6.5,6.5)
-(8.9,7.2)
-(1.5,1.5,1.5,1.5)
-False
-True
-(2.5,2.5)
-False
-True
-(12.7,14.1,7.0,15.7)
-(-3.6999998,1.5,-2.3999999,-2.6999998)
-(36.899998,49.140003,10.809999,59.8)
-(0.5487805,1.2380953,0.4893617,0.70652175)
-(-4.5,-7.8,-2.3,-6.5)
-(3.5,3.5)
-(1.2999999999999998,1.2999999999999998)
-(5.28,5.28)
-(2.3,2.3)
-(-3.5,-3.5)