summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-06-22 13:21:49 -0400
committerBen Gamari <ben@smart-cactus.org>2022-06-23 00:51:58 -0400
commita44bdc2720015c03d57f470b759ece7fab29a57a (patch)
tree0d2b1043c2b3f3bf92545e6640a589c8b5d5e55d /testsuite/tests
parent20a0163b4081d6439a5621b50ef3bb1f90a8d4c8 (diff)
downloadhaskell-a44bdc2720015c03d57f470b759ece7fab29a57a.tar.gz
Revert "Use fix-sized bit-fiddling primops for fixed size boxed types"ghc-9.4.1-alpha3
This reverts commit 4512ad2d6a8e65ea43c86c816411cb13b822f674.
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/simplCore/should_run/T20203.stderr-ws-3257
-rw-r--r--testsuite/tests/simplCore/should_run/T20203.stderr-ws-6456
2 files changed, 80 insertions, 33 deletions
diff --git a/testsuite/tests/simplCore/should_run/T20203.stderr-ws-32 b/testsuite/tests/simplCore/should_run/T20203.stderr-ws-32
index 2d904fc5a4..7869c7ecf7 100644
--- a/testsuite/tests/simplCore/should_run/T20203.stderr-ws-32
+++ b/testsuite/tests/simplCore/should_run/T20203.stderr-ws-32
@@ -1,7 +1,7 @@
==================== Tidy Core ====================
Result size of Tidy Core
- = {terms: 290, types: 141, coercions: 0, joins: 0/0}
+ = {terms: 340, types: 140, coercions: 0, joins: 0/0}
bitOrTwoVarInt
= \ x y ->
@@ -24,33 +24,50 @@ bitOrTwoVarInt8
case x of { I8# x# ->
case y of { I8# x#1 ->
I8#
- (word8ToInt8#
- (orWord8# 17##8 (orWord8# (int8ToWord8# x#) (int8ToWord8# x#1))))
+ (intToInt8#
+ (orI#
+ (int8ToInt# (intToInt8# (orI# (int8ToInt# x#) 1#)))
+ (int8ToInt# (intToInt8# (orI# (int8ToInt# x#1) 16#)))))
}
}
-bitAndInt1 = I8# 0#8
-
bitAndTwoVarInt8
= \ x y ->
- case x of { I8# x# -> case y of { I8# x#1 -> bitAndInt1 } }
+ case x of { I8# x# ->
+ case y of { I8# x#1 ->
+ I8#
+ (intToInt8#
+ (andI#
+ (int8ToInt# (intToInt8# (andI# (int8ToInt# x#) 1#)))
+ (int8ToInt# (intToInt8# (andI# (int8ToInt# x#1) 16#)))))
+ }
+ }
bitOrInt8
= \ x ->
case x of { I8# x# ->
- I8# (word8ToInt8# (orWord8# 17##8 (int8ToWord8# x#)))
+ I8#
+ (intToInt8#
+ (orI# (int8ToInt# (intToInt8# (orI# (int8ToInt# x#) 1#))) 16#))
}
-bitAndInt8 = \ x -> case x of { I8# x# -> bitAndInt1 }
+bitAndInt8
+ = / x ->
+ case x of { I8# x# ->
+ I8#
+ (intToInt8#
+ (andI# (int8ToInt# (intToInt8# (andI# (int8ToInt# x#) 1#))) 16#))
+ }
bitOrTwoVarInt16
= \ x y ->
case x of { I16# x# ->
case y of { I16# x#1 ->
I16#
- (word16ToInt16#
- (orWord16#
- 255##16 (orWord16# (int16ToWord16# x#) (int16ToWord16# x#1))))
+ (intToInt16#
+ (orI#
+ (int16ToInt# (intToInt16# (orI# (int16ToInt# x#) 250#)))
+ (int16ToInt# (intToInt16# (orI# (int16ToInt# x#1) 175#)))))
}
}
@@ -59,22 +76,28 @@ bitAndTwoVarInt16
case x of { I16# x# ->
case y of { I16# x#1 ->
I16#
- (word16ToInt16#
- (andWord16#
- 170##16 (andWord16# (int16ToWord16# x#) (int16ToWord16# x#1))))
- }
+ (intToInt16#
+ (andI#
+ (int16ToInt# (intToInt16# (andI# (int16ToInt# x#) 250#)))
+ (int16ToInt# (intToInt16# (andI# (int16ToInt# x#1) 175#))))) }
}
bitOrInt16
= \ x ->
case x of { I16# x# ->
- I16# (word16ToInt16# (orWord16# 255##16 (int16ToWord16# x#)))
+ I16#
+ (intToInt16#
+ (orI#
+ (int16ToInt# (intToInt16# (orI# (int16ToInt# x#) 250#))) 175#))
}
bitAndInt16
= \ x ->
case x of { I16# x# ->
- I16# (word16ToInt16# (andWord16# 170##16 (int16ToWord16# x#)))
+ I16#
+ (intToInt16#
+ (andI#
+ (int16ToInt# (intToInt16# (andI# (int16ToInt# x#) 250#))) 175#))
}
bitOrTwoVarInt32
diff --git a/testsuite/tests/simplCore/should_run/T20203.stderr-ws-64 b/testsuite/tests/simplCore/should_run/T20203.stderr-ws-64
index 194091e5f3..86630eb82d 100644
--- a/testsuite/tests/simplCore/should_run/T20203.stderr-ws-64
+++ b/testsuite/tests/simplCore/should_run/T20203.stderr-ws-64
@@ -1,7 +1,7 @@
==================== Tidy Core ====================
Result size of Tidy Core
- = {terms: 290, types: 141, coercions: 0, joins: 0/0}
+ = {terms: 340, types: 140, coercions: 0, joins: 0/0}
bitOrTwoVarInt
= \ x y ->
@@ -24,33 +24,50 @@ bitOrTwoVarInt8
case x of { I8# x# ->
case y of { I8# x#1 ->
I8#
- (word8ToInt8#
- (orWord8# 17##8 (orWord8# (int8ToWord8# x#) (int8ToWord8# x#1))))
+ (intToInt8#
+ (orI#
+ (int8ToInt# (intToInt8# (orI# (int8ToInt# x#) 1#)))
+ (int8ToInt# (intToInt8# (orI# (int8ToInt# x#1) 16#)))))
}
}
-bitAndInt1 = I8# 0#8
-
bitAndTwoVarInt8
= \ x y ->
- case x of { I8# x# -> case y of { I8# x#1 -> bitAndInt1 } }
+ case x of { I8# x# ->
+ case y of { I8# x#1 ->
+ I8#
+ (intToInt8#
+ (andI#
+ (int8ToInt# (intToInt8# (andI# (int8ToInt# x#) 1#)))
+ (int8ToInt# (intToInt8# (andI# (int8ToInt# x#1) 16#)))))
+ }
+ }
bitOrInt8
= \ x ->
case x of { I8# x# ->
- I8# (word8ToInt8# (orWord8# 17##8 (int8ToWord8# x#)))
+ I8#
+ (intToInt8#
+ (orI# (int8ToInt# (intToInt8# (orI# (int8ToInt# x#) 1#))) 16#))
}
-bitAndInt8 = \ x -> case x of { I8# x# -> bitAndInt1 }
+bitAndInt8
+ = \ x ->
+ case x of { I8# x# ->
+ I8#
+ (intToInt8#
+ (andI# (int8ToInt# (intToInt8# (andI# (int8ToInt# x#) 1#))) 16#))
+ }
bitOrTwoVarInt16
= \ x y ->
case x of { I16# x# ->
case y of { I16# x#1 ->
I16#
- (word16ToInt16#
- (orWord16#
- 255##16 (orWord16# (int16ToWord16# x#) (int16ToWord16# x#1))))
+ (intToInt16#
+ (orI#
+ (int16ToInt# (intToInt16# (orI# (int16ToInt# x#) 250#)))
+ (int16ToInt# (intToInt16# (orI# (int16ToInt# x#1) 175#)))))
}
}
@@ -59,22 +76,29 @@ bitAndTwoVarInt16
case x of { I16# x# ->
case y of { I16# x#1 ->
I16#
- (word16ToInt16#
- (andWord16#
- 170##16 (andWord16# (int16ToWord16# x#) (int16ToWord16# x#1))))
+ (intToInt16#
+ (andI#
+ (int16ToInt# (intToInt16# (andI# (int16ToInt# x#) 250#)))
+ (int16ToInt# (intToInt16# (andI# (int16ToInt# x#1) 175#)))))
}
}
bitOrInt16
= \ x ->
case x of { I16# x# ->
- I16# (word16ToInt16# (orWord16# 255##16 (int16ToWord16# x#)))
+ I16#
+ (intToInt16#
+ (orI#
+ (int16ToInt# (intToInt16# (orI# (int16ToInt# x#) 250#))) 175#))
}
bitAndInt16
= \ x ->
case x of { I16# x# ->
- I16# (word16ToInt16# (andWord16# 170##16 (int16ToWord16# x#)))
+ I16#
+ (intToInt16#
+ (andI#
+ (int16ToInt# (intToInt16# (andI# (int16ToInt# x#) 250#))) 175#))
}
bitOrTwoVarInt32