5 files changed, 267 insertions, 15 deletions
diff --git a/validation/optim/bool-context-fp.c b/validation/optim/bool-context-fp.c
index 50e96825..3bfc3343 100644
--- a/validation/optim/bool-context-fp.c
+++ b/validation/optim/bool-context-fp.c
@@ -18,7 +18,7 @@ int  ifand(float a, float b) { return a && b; }
 bfimp:
 .L0:
 	<entry-point>
-	setfval.32  %r2 <- 0.000000
+	setfval.32  %r2 <- 0.000000e+00
 	fcmpune.1   %r3 <- %arg1, %r2
 	ret.1       %r3
 
@@ -26,7 +26,7 @@ bfimp:
 bfexp:
 .L2:
 	<entry-point>
-	setfval.32  %r6 <- 0.000000
+	setfval.32  %r6 <- 0.000000e+00
 	fcmpune.1   %r7 <- %arg1, %r6
 	ret.1       %r7
 
@@ -34,7 +34,7 @@ bfexp:
 bfnot:
 .L4:
 	<entry-point>
-	setfval.32  %r10 <- 0.000000
+	setfval.32  %r10 <- 0.000000e+00
 	fcmpoeq.1   %r12 <- %arg1, %r10
 	ret.1       %r12
 
@@ -42,7 +42,7 @@ bfnot:
 ifnot:
 .L6:
 	<entry-point>
-	setfval.32  %r15 <- 0.000000
+	setfval.32  %r15 <- 0.000000e+00
 	fcmpoeq.32  %r16 <- %arg1, %r15
 	ret.32      %r16
 
@@ -50,7 +50,7 @@ ifnot:
 bfior:
 .L8:
 	<entry-point>
-	setfval.32  %r19 <- 0.000000
+	setfval.32  %r19 <- 0.000000e+00
 	fcmpune.1   %r20 <- %arg1, %r19
 	fcmpune.1   %r23 <- %arg2, %r19
 	or.1        %r24 <- %r20, %r23
@@ -61,7 +61,7 @@ bfior:
 ifior:
 .L10:
 	<entry-point>
-	setfval.32  %r29 <- 0.000000
+	setfval.32  %r29 <- 0.000000e+00
 	fcmpune.1   %r30 <- %arg1, %r29
 	fcmpune.1   %r33 <- %arg2, %r29
 	or.1        %r34 <- %r30, %r33
@@ -72,7 +72,7 @@ ifior:
 bfand:
 .L12:
 	<entry-point>
-	setfval.32  %r38 <- 0.000000
+	setfval.32  %r38 <- 0.000000e+00
 	fcmpune.1   %r39 <- %arg1, %r38
 	fcmpune.1   %r42 <- %arg2, %r38
 	and.1       %r43 <- %r39, %r42
@@ -83,7 +83,7 @@ bfand:
 ifand:
 .L14:
 	<entry-point>
-	setfval.32  %r48 <- 0.000000
+	setfval.32  %r48 <- 0.000000e+00
 	fcmpune.1   %r49 <- %arg1, %r48
 	fcmpune.1   %r52 <- %arg2, %r48
 	and.1       %r53 <- %r49, %r52
diff --git a/validation/optim/lsr-asr.c b/validation/optim/lsr-asr.c
new file mode 100644
index 00000000..aee46940
--- /dev/null
+++ b/validation/optim/lsr-asr.c
@@ -0,0 +1,42 @@
+int lsrasr0(unsigned int x)
+{
+	return ((int) (x >> 15)) >> 15;
+}
+
+int lsrasr1(unsigned int x)
+{
+	return ((int) (x >> 16)) >> 15;
+}
+
+int lsrasr2(unsigned int x)
+{
+	return ((int) (x >> 16)) >> 16;
+}
+
+/*
+ * check-name: lsr-asr
+ * check-command: test-linearize -Wno-decl $file
+ *
+ * check-output-start
+lsrasr0:
+.L0:
+	<entry-point>
+	lsr.32      %r3 <- %arg1, $30
+	ret.32      %r3
+
+
+lsrasr1:
+.L2:
+	<entry-point>
+	lsr.32      %r7 <- %arg1, $31
+	ret.32      %r7
+
+
+lsrasr2:
+.L4:
+	<entry-point>
+	ret.32      $0
+
+
+ * check-output-end
+ */
diff --git a/validation/optim/shift-big.c b/validation/optim/shift-big.c
index da65c5cd..84bcd2ce 100644
--- a/validation/optim/shift-big.c
+++ b/validation/optim/shift-big.c
@@ -1,20 +1,29 @@
 typedef unsigned int u32;
 typedef          int s32;
 
-static u32 lsr32(u32 a) { return a >> 32; }
-static s32 asr32(s32 a) { return a >> 32; }
-static u32 shl32(u32 a) { return a << 32; }
+s32 asr31(s32 a) { return a >> 31; }
+s32 asr32(s32 a) { return a >> 32; }
+s32 asr33(s32 a) { return a >> 33; }
+
+u32 lsr31(u32 a) { return a >> 31; }
+u32 lsr32(u32 a) { return a >> 32; }
+u32 lsr33(u32 a) { return a >> 33; }
+
+u32 shl31(u32 a) { return a << 31; }
+u32 shl32(u32 a) { return a << 32; }
+u32 shl33(u32 a) { return a << 33; }
 
 /*
  * check-name: optim/shift-big.c
- * check-command: test-linearize -fnormalize-pseudos $file
+ * check-command: test-linearize -Wno-decl -m64 $file
  *
  * check-error-ignore
  * check-output-start
-lsr32:
+asr31:
 .L0:
 	<entry-point>
-	ret.32      $0
+	asr.32      %r2 <- %arg1, $31
+	ret.32      %r2
 
 
 asr32:
@@ -24,9 +33,48 @@ asr32:
 	ret.32      %r5
 
 
-shl32:
+asr33:
 .L4:
 	<entry-point>
+	asr.32      %r8 <- %arg1, $33
+	ret.32      %r8
+
+
+lsr31:
+.L6:
+	<entry-point>
+	lsr.32      %r11 <- %arg1, $31
+	ret.32      %r11
+
+
+lsr32:
+.L8:
+	<entry-point>
+	ret.32      $0
+
+
+lsr33:
+.L10:
+	<entry-point>
+	ret.32      $0
+
+
+shl31:
+.L12:
+	<entry-point>
+	shl.32      %r20 <- %arg1, $31
+	ret.32      %r20
+
+
+shl32:
+.L14:
+	<entry-point>
+	ret.32      $0
+
+
+shl33:
+.L16:
+	<entry-point>
 	ret.32      $0
 
 
diff --git a/validation/optim/shift-shift.c b/validation/optim/shift-shift.c
new file mode 100644
index 00000000..12a4b7d4
--- /dev/null
+++ b/validation/optim/shift-shift.c
@@ -0,0 +1,149 @@
+unsigned int shl0(unsigned int x)
+{
+	return x << 15 << 15;
+}
+
+unsigned int shl1(unsigned int x)
+{
+	return x << 16 << 15;
+}
+
+unsigned int shl2(unsigned int x)
+{
+	return x << 16 << 16;
+}
+
+unsigned int shl3(unsigned int x)
+{
+	return x << 12 << 10 << 10;
+}
+
+
+unsigned int lsr0(unsigned int x)
+{
+	return x >> 15 >> 15;
+}
+
+unsigned int lsr1(unsigned int x)
+{
+	return x >> 16 >> 15;
+}
+
+unsigned int lsr2(unsigned int x)
+{
+	return x >> 16 >> 16;
+}
+
+unsigned int lsr3(unsigned int x)
+{
+	return x >> 12 >> 10 >> 10;
+}
+
+
+int asr0(int x)
+{
+	return x >> 15 >> 15;
+}
+
+int asr1(int x)
+{
+	return x >> 16 >> 15;
+}
+
+int asr2(int x)
+{
+	return x >> 16 >> 16;
+}
+
+int asr3(int x)
+{
+	return x >> 12 >> 10 >> 10;
+}
+
+/*
+ * check-name: shift-shift
+ * check-command: test-linearize -Wno-decl $file
+ *
+ * check-output-start
+shl0:
+.L0:
+	<entry-point>
+	shl.32      %r3 <- %arg1, $30
+	ret.32      %r3
+
+
+shl1:
+.L2:
+	<entry-point>
+	shl.32      %r7 <- %arg1, $31
+	ret.32      %r7
+
+
+shl2:
+.L4:
+	<entry-point>
+	ret.32      $0
+
+
+shl3:
+.L6:
+	<entry-point>
+	ret.32      $0
+
+
+lsr0:
+.L8:
+	<entry-point>
+	lsr.32      %r20 <- %arg1, $30
+	ret.32      %r20
+
+
+lsr1:
+.L10:
+	<entry-point>
+	lsr.32      %r24 <- %arg1, $31
+	ret.32      %r24
+
+
+lsr2:
+.L12:
+	<entry-point>
+	ret.32      $0
+
+
+lsr3:
+.L14:
+	<entry-point>
+	ret.32      $0
+
+
+asr0:
+.L16:
+	<entry-point>
+	asr.32      %r37 <- %arg1, $30
+	ret.32      %r37
+
+
+asr1:
+.L18:
+	<entry-point>
+	asr.32      %r41 <- %arg1, $31
+	ret.32      %r41
+
+
+asr2:
+.L20:
+	<entry-point>
+	asr.32      %r45 <- %arg1, $31
+	ret.32      %r45
+
+
+asr3:
+.L22:
+	<entry-point>
+	asr.32      %r50 <- %arg1, $31
+	ret.32      %r50
+
+
+ * check-output-end
+ */
diff --git a/validation/optim/zext-asr.c b/validation/optim/zext-asr.c
new file mode 100644
index 00000000..5f235ad8
--- /dev/null
+++ b/validation/optim/zext-asr.c
@@ -0,0 +1,13 @@
+unsigned short foo(unsigned short a)
+{
+	return a >> 16;
+}
+
+/*
+ * check-name: zext-asr
+ * check-command: test-linearize -Wno-decl $file
+ *
+ * check-output-ignore
+ * check-output-contains: ret\\..*\\$0
+ * check-output-excludes: asr\\.
+ */