CellSPU:

- Teach SPU64InstrInfo.td about the remaining signed comparisons, update tests
  accordingly.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61672 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 307 insertions, 172 deletions

diff --git a/test/CodeGen/CellSPU/icmp64.ll b/test/CodeGen/CellSPU/icmp64.ll
index 0b5eaafbd6..b26252cedb 100644
--- a/test/CodeGen/CellSPU/icmp64.ll
+++ b/test/CodeGen/CellSPU/icmp64.ll
@@ -1,11 +1,12 @@
 ; RUN: llvm-as -o - %s | llc -march=cellspu > %t1.s
-; RUN: grep ceq                                %t1.s | count 6
-; RUN: grep cgti                               %t1.s | count 4
-; RUN: grep clgt                               %t1.s | count 2
-; RUN: grep gb                                 %t1.s | count 4
-; RUN: grep fsm                                %t1.s | count 3
-; RUN: grep xori                               %t1.s | count 1
-; RUN: grep selb                               %t1.s | count 5
+; RUN: grep ceq                                %t1.s | count 20
+; RUN: grep cgti                               %t1.s | count 12
+; RUN: grep cgt                                %t1.s | count 16
+; RUN: grep clgt                               %t1.s | count 12
+; RUN: grep gb                                 %t1.s | count 12
+; RUN: grep fsm                                %t1.s | count 10
+; RUN: grep xori                               %t1.s | count 5
+; RUN: grep selb                               %t1.s | count 18
 
 target datalayout = "E-p:32:32:128-f64:64:128-f32:32:128-i64:32:128-i32:32:128-i16:16:128-i8:8:128-i1:8:128-a0:0:128-v128:128:128-s0:128:128"
 target triple = "spu"
@@ -53,93 +54,93 @@ entry:
        ret i1 %A
 }
 
-;; define i64 @icmp_uge_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp uge i64 %arg1, %arg2
-;;        %B = select i1 %A, i64 %val1, i64 %val2
-;;        ret i64 %B
-;; }
-;; 
-;; define i1 @icmp_uge_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp uge i64 %arg1, %arg2
-;;        ret i1 %A
-;; }
-;; 
-;; define i64 @icmp_ult_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp ult i64 %arg1, %arg2
-;;        %B = select i1 %A, i64 %val1, i64 %val2
-;;        ret i64 %B
-;; }
-;; 
-;; define i1 @icmp_ult_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp ult i64 %arg1, %arg2
-;;        ret i1 %A
-;; }
-;; 
-;; define i64 @icmp_ule_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp ule i64 %arg1, %arg2
-;;        %B = select i1 %A, i64 %val1, i64 %val2
-;;        ret i64 %B
-;; }
-;; 
-;; define i1 @icmp_ule_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp ule i64 %arg1, %arg2
-;;        ret i1 %A
-;; }
-;; 
-;; define i64 @icmp_sgt_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp sgt i64 %arg1, %arg2
-;;        %B = select i1 %A, i64 %val1, i64 %val2
-;;        ret i64 %B
-;; }
-;; 
-;; define i1 @icmp_sgt_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp sgt i64 %arg1, %arg2
-;;        ret i1 %A
-;; }
-;; 
-;; define i64 @icmp_sge_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp sge i64 %arg1, %arg2
-;;        %B = select i1 %A, i64 %val1, i64 %val2
-;;        ret i64 %B
-;; }
-;; 
-;; define i1 @icmp_sge_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp sge i64 %arg1, %arg2
-;;        ret i1 %A
-;; }
-;; 
-;; define i64 @icmp_slt_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp slt i64 %arg1, %arg2
-;;        %B = select i1 %A, i64 %val1, i64 %val2
-;;        ret i64 %B
-;; }
-;; 
-;; define i1 @icmp_slt_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp slt i64 %arg1, %arg2
-;;        ret i1 %A
-;; }
-;; 
-;; define i64 @icmp_sle_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp sle i64 %arg1, %arg2
-;;        %B = select i1 %A, i64 %val1, i64 %val2
-;;        ret i64 %B
-;; }
-;; 
-;; define i1 @icmp_sle_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
-;; entry:
-;;        %A = icmp sle i64 %arg1, %arg2
-;;        ret i1 %A
-;; }
+define i64 @icmp_uge_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp uge i64 %arg1, %arg2
+       %B = select i1 %A, i64 %val1, i64 %val2
+       ret i64 %B
+}
+
+define i1 @icmp_uge_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp uge i64 %arg1, %arg2
+       ret i1 %A
+}
+
+define i64 @icmp_ult_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp ult i64 %arg1, %arg2
+       %B = select i1 %A, i64 %val1, i64 %val2
+       ret i64 %B
+}
+
+define i1 @icmp_ult_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp ult i64 %arg1, %arg2
+       ret i1 %A
+}
+
+define i64 @icmp_ule_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp ule i64 %arg1, %arg2
+       %B = select i1 %A, i64 %val1, i64 %val2
+       ret i64 %B
+}
+
+define i1 @icmp_ule_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp ule i64 %arg1, %arg2
+       ret i1 %A
+}
+
+define i64 @icmp_sgt_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp sgt i64 %arg1, %arg2
+       %B = select i1 %A, i64 %val1, i64 %val2
+       ret i64 %B
+}
+
+define i1 @icmp_sgt_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp sgt i64 %arg1, %arg2
+       ret i1 %A
+}
+
+define i64 @icmp_sge_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp sge i64 %arg1, %arg2
+       %B = select i1 %A, i64 %val1, i64 %val2
+       ret i64 %B
+}
+
+define i1 @icmp_sge_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp sge i64 %arg1, %arg2
+       ret i1 %A
+}
+
+define i64 @icmp_slt_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp slt i64 %arg1, %arg2
+       %B = select i1 %A, i64 %val1, i64 %val2
+       ret i64 %B
+}
+
+define i1 @icmp_slt_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp slt i64 %arg1, %arg2
+       ret i1 %A
+}
+
+define i64 @icmp_sle_select_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp sle i64 %arg1, %arg2
+       %B = select i1 %A, i64 %val1, i64 %val2
+       ret i64 %B
+}
+
+define i1 @icmp_sle_setcc_i64(i64 %arg1, i64 %arg2, i64 %val1, i64 %val2) nounwind {
+entry:
+       %A = icmp sle i64 %arg1, %arg2
+       ret i1 %A
+}
diff --git a/test/CodeGen/CellSPU/useful-harnesses/i64operations.c b/test/CodeGen/CellSPU/useful-harnesses/i64operations.c
index a2e7a9f676..b93ce37610 100644
--- a/test/CodeGen/CellSPU/useful-harnesses/i64operations.c
+++ b/test/CodeGen/CellSPU/useful-harnesses/i64operations.c
@@ -9,63 +9,127 @@ typedef long long int int64_t;
 
 /* ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~- */
 
-int64_t         a = 1234567890003LL;
-int64_t         b = 2345678901235LL;
-int64_t         c = 1234567890001LL;
-int64_t         d = 10001LL;
-int64_t         e = 10000LL;
-int64_t         f = -1068103409991LL;
+int64_t         tval_a = 1234567890003LL;
+int64_t         tval_b = 2345678901235LL;
+int64_t         tval_c = 1234567890001LL;
+int64_t         tval_d = 10001LL;
+int64_t         tval_e = 10000LL;
+int64_t         tval_f = -1068103409991LL;
 
 /* ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~- */
 
-int 
+int
 i64_eq(int64_t a, int64_t b)
 {
   return (a == b);
 }
 
-int 
+int
 i64_neq(int64_t a, int64_t b)
 {
   return (a != b);
 }
 
-int 
+int
+i64_gt(int64_t a, int64_t b)
+{
+  return (a > b);
+}
+
+int
+i64_le(int64_t a, int64_t b)
+{
+  return (a <= b);
+}
+
+int
+i64_ge(int64_t a, int64_t b) {
+  return (a >= b);
+}
+
+int
+i64_lt(int64_t a, int64_t b) {
+  return (a < b);
+}
+
+int
+i64_uge(uint64_t a, uint64_t b)
+{
+  return (a >= b);
+}
+
+int
+i64_ult(uint64_t a, uint64_t b)
+{
+  return (a < b);
+}
+
+int
 i64_ugt(uint64_t a, uint64_t b)
 {
   return (a > b);
 }
 
-int 
+int
 i64_ule(uint64_t a, uint64_t b)
 {
   return (a <= b);
 }
 
-int64_t 
+int64_t
 i64_eq_select(int64_t a, int64_t b, int64_t c, int64_t d)
 {
   return ((a == b) ? c : d);
 }
 
-int64_t 
+int64_t
 i64_neq_select(int64_t a, int64_t b, int64_t c, int64_t d)
 {
   return ((a != b) ? c : d);
 }
 
-uint64_t 
+int64_t
+i64_gt_select(int64_t a, int64_t b, int64_t c, int64_t d) {
+  return ((a > b) ? c : d);
+}
+
+int64_t
+i64_le_select(int64_t a, int64_t b, int64_t c, int64_t d) {
+  return ((a <= b) ? c : d);
+}
+
+int64_t
+i64_ge_select(int64_t a, int64_t b, int64_t c, int64_t d) {
+  return ((a >= b) ? c : d);
+}
+
+int64_t
+i64_lt_select(int64_t a, int64_t b, int64_t c, int64_t d) {
+  return ((a < b) ? c : d);
+}
+
+uint64_t
 i64_ugt_select(uint64_t a, uint64_t b, uint64_t c, uint64_t d)
 {
   return ((a > b) ? c : d);
 }
 
-uint64_t 
+uint64_t
 i64_ule_select(uint64_t a, uint64_t b, uint64_t c, uint64_t d)
 {
   return ((a <= b) ? c : d);
 }
 
+uint64_t
+i64_uge_select(uint64_t a, uint64_t b, uint64_t c, uint64_t d) {
+  return ((a >= b) ? c : d);
+}
+
+uint64_t
+i64_ult_select(uint64_t a, uint64_t b, uint64_t c, uint64_t d) {
+  return ((a < b) ? c : d);
+}
+
 /* ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~- */
 
 struct harness_int64_pred {
@@ -107,64 +171,134 @@ struct uint64_pred_s {
 /* ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~- */
 
 struct harness_int64_pred int64_tests_eq[] = {
-  {"a %s a", &a, &a, &c, &d, TRUE_VAL, &c},
-  {"a %s b", &a, &b, &c, &d, FALSE_VAL, &d},
-  {"a %s c", &a, &c, &c, &d, FALSE_VAL, &d},
-  {"d %s e", &d, &e, &c, &d, FALSE_VAL, &d},
-  {"e %s e", &e, &e, &c, &d, TRUE_VAL, &c}
+  {"a %s a", &tval_a, &tval_a, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"a %s b", &tval_a, &tval_b, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"a %s c", &tval_a, &tval_c, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"d %s e", &tval_d, &tval_e, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"e %s e", &tval_e, &tval_e, &tval_c, &tval_d, TRUE_VAL, &tval_c}
 };
 
 struct harness_int64_pred int64_tests_neq[] = {
-  {"a %s a", &a, &a, &c, &d, FALSE_VAL, &d},
-  {"a %s b", &a, &b, &c, &d, TRUE_VAL, &c},
-  {"a %s c", &a, &c, &c, &d, TRUE_VAL, &c},
-  {"d %s e", &d, &e, &c, &d, TRUE_VAL, &c},
-  {"e %s e", &e, &e, &c, &d, FALSE_VAL, &d}
+  {"a %s a", &tval_a, &tval_a, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"a %s b", &tval_a, &tval_b, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"a %s c", &tval_a, &tval_c, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"d %s e", &tval_d, &tval_e, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"e %s e", &tval_e, &tval_e, &tval_c, &tval_d, FALSE_VAL, &tval_d}
+};
+
+struct harness_int64_pred int64_tests_sgt[] = {
+  {"a %s a", &tval_a, &tval_a, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"a %s b", &tval_a, &tval_b, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"a %s c", &tval_a, &tval_c, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"d %s e", &tval_d, &tval_e, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"e %s e", &tval_e, &tval_e, &tval_c, &tval_d, FALSE_VAL, &tval_d}
+};
+
+struct harness_int64_pred int64_tests_sle[] = {
+  {"a %s a", &tval_a, &tval_a, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"a %s b", &tval_a, &tval_b, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"a %s c", &tval_a, &tval_c, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"d %s e", &tval_d, &tval_e, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"e %s e", &tval_e, &tval_e, &tval_c, &tval_d, TRUE_VAL, &tval_c}
+};
+
+struct harness_int64_pred int64_tests_sge[] = {
+  {"a %s a", &tval_a, &tval_a, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"a %s b", &tval_a, &tval_b, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"a %s c", &tval_a, &tval_c, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"d %s e", &tval_d, &tval_e, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"e %s e", &tval_e, &tval_e, &tval_c, &tval_d, TRUE_VAL, &tval_c}
+};
+
+struct harness_int64_pred int64_tests_slt[] = {
+  {"a %s a", &tval_a, &tval_a, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"a %s b", &tval_a, &tval_b, &tval_c, &tval_d, TRUE_VAL, &tval_c},
+  {"a %s c", &tval_a, &tval_c, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"d %s e", &tval_d, &tval_e, &tval_c, &tval_d, FALSE_VAL, &tval_d},
+  {"e %s e", &tval_e, &tval_e, &tval_c, &tval_d, FALSE_VAL, &tval_d}
 };
 
 struct int64_pred_s int64_preds[] = {
   {"eq", i64_eq, i64_eq_select,
      int64_tests_eq, ARR_SIZE(int64_tests_eq)},
   {"neq", i64_neq, i64_neq_select,
-     int64_tests_neq, ARR_SIZE(int64_tests_neq)}
+     int64_tests_neq, ARR_SIZE(int64_tests_neq)},
+  {"gt", i64_gt, i64_gt_select,
+     int64_tests_sgt, ARR_SIZE(int64_tests_sgt)},
+  {"le", i64_le, i64_le_select,
+     int64_tests_sle, ARR_SIZE(int64_tests_sle)},
+  {"ge", i64_ge, i64_ge_select,
+     int64_tests_sge, ARR_SIZE(int64_tests_sge)},
+  {"lt", i64_lt, i64_lt_select,
+     int64_tests_slt, ARR_SIZE(int64_tests_slt)}
 };
 
 /* ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~- */
 
 struct harness_uint64_pred uint64_tests_ugt[] = {
-  {"a %s a", (uint64_t *) &a, (uint64_t *) &a, (uint64_t *) &c,
-     (uint64_t *) &d, FALSE_VAL, (uint64_t *) &d},
-  {"a %s b", (uint64_t *) &a, (uint64_t *) &b, (uint64_t *) &c,
-     (uint64_t *) &d, FALSE_VAL, (uint64_t *) &d },
-  {"a %s c", (uint64_t *) &a, (uint64_t *) &c, (uint64_t *) &c,
-     (uint64_t *) &d, TRUE_VAL, (uint64_t *) &c },
-  {"d %s e", (uint64_t *) &d, (uint64_t *) &e, (uint64_t *) &c,
-     (uint64_t *) &d, TRUE_VAL, (uint64_t *) &c },
-  {"e %s e", (uint64_t *) &e, (uint64_t *) &e, (uint64_t *) &c,
-     (uint64_t *) &d, FALSE_VAL, (uint64_t *) &d }
+  {"a %s a", (uint64_t *) &tval_a, (uint64_t *) &tval_a, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d},
+  {"a %s b", (uint64_t *) &tval_a, (uint64_t *) &tval_b, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d },
+  {"a %s c", (uint64_t *) &tval_a, (uint64_t *) &tval_c, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c },
+  {"d %s e", (uint64_t *) &tval_d, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c },
+  {"e %s e", (uint64_t *) &tval_e, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d }
 };
 
 struct harness_uint64_pred uint64_tests_ule[] = {
-  {"a %s a", (uint64_t *) &a, (uint64_t *) &a, (uint64_t *) &c,
-     (uint64_t *) &d, TRUE_VAL, (uint64_t *) &c},
-  {"a %s b", (uint64_t *) &a, (uint64_t *) &b, (uint64_t *) &c,
-     (uint64_t *) &d, TRUE_VAL, (uint64_t *) &c},
-  {"a %s c", (uint64_t *) &a, (uint64_t *) &c, (uint64_t *) &c,
-     (uint64_t *) &d, FALSE_VAL, (uint64_t *) &d},
-  {"d %s e", (uint64_t *) &d, (uint64_t *) &e, (uint64_t *) &c,
-     (uint64_t *) &d, FALSE_VAL, (uint64_t *) &d},
-  {"e %s e", (uint64_t *) &e, (uint64_t *) &e, (uint64_t *) &c,
-     (uint64_t *) &d, TRUE_VAL, (uint64_t *) &c}
+  {"a %s a", (uint64_t *) &tval_a, (uint64_t *) &tval_a, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c},
+  {"a %s b", (uint64_t *) &tval_a, (uint64_t *) &tval_b, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c},
+  {"a %s c", (uint64_t *) &tval_a, (uint64_t *) &tval_c, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d},
+  {"d %s e", (uint64_t *) &tval_d, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d},
+  {"e %s e", (uint64_t *) &tval_e, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c}
+};
+
+struct harness_uint64_pred uint64_tests_uge[] = {
+  {"a %s a", (uint64_t *) &tval_a, (uint64_t *) &tval_a, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c},
+  {"a %s b", (uint64_t *) &tval_a, (uint64_t *) &tval_b, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d},
+  {"a %s c", (uint64_t *) &tval_a, (uint64_t *) &tval_c, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c},
+  {"d %s e", (uint64_t *) &tval_d, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c},
+  {"e %s e", (uint64_t *) &tval_e, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c}
+};
+
+struct harness_uint64_pred uint64_tests_ult[] = {
+  {"a %s a", (uint64_t *) &tval_a, (uint64_t *) &tval_a, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d},
+  {"a %s b", (uint64_t *) &tval_a, (uint64_t *) &tval_b, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, TRUE_VAL, (uint64_t *) &tval_c},
+  {"a %s c", (uint64_t *) &tval_a, (uint64_t *) &tval_c, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d},
+  {"d %s e", (uint64_t *) &tval_d, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d},
+  {"e %s e", (uint64_t *) &tval_e, (uint64_t *) &tval_e, (uint64_t *) &tval_c,
+     (uint64_t *) &tval_d, FALSE_VAL, (uint64_t *) &tval_d}
 };
 
 struct uint64_pred_s uint64_preds[] = {
   {"ugt", i64_ugt, i64_ugt_select,
      uint64_tests_ugt, ARR_SIZE(uint64_tests_ugt)},
   {"ule", i64_ule, i64_ule_select,
-     uint64_tests_ule, ARR_SIZE(uint64_tests_ule)}
+     uint64_tests_ule, ARR_SIZE(uint64_tests_ule)},
+  {"uge", i64_uge, i64_uge_select,
+     uint64_tests_uge, ARR_SIZE(uint64_tests_uge)},
+  {"ult", i64_ult, i64_ult_select,
+     uint64_tests_ult, ARR_SIZE(uint64_tests_ult)}
 };
 
-int 
+int
 compare_expect_int64(const struct int64_pred_s * pred)
 {
   int             j, failed = 0;
@@ -203,7 +337,7 @@ compare_expect_int64(const struct int64_pred_s * pred)
   return failed;
 }
 
-int 
+int
 compare_expect_uint64(const struct uint64_pred_s * pred)
 {
   int             j, failed = 0;
@@ -244,37 +378,37 @@ compare_expect_uint64(const struct uint64_pred_s * pred)
 
 /* ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~- */
 
-uint64_t 
+uint64_t
 i64_shl_const(uint64_t a)
 {
   return a << 10;
 }
 
-uint64_t 
+uint64_t
 i64_shl(uint64_t a, int amt)
 {
   return a << amt;
 }
 
-uint64_t 
+uint64_t
 i64_srl_const(uint64_t a)
 {
   return a >> 10;
 }
 
-uint64_t 
+uint64_t
 i64_srl(uint64_t a, int amt)
 {
   return a >> amt;
 }
 
-int64_t 
+int64_t
 i64_sra_const(int64_t a)
 {
   return a >> 10;
 }
 
-int64_t 
+int64_t
 i64_sra(int64_t a, int amt)
 {
   return a >> amt;
@@ -282,19 +416,19 @@ i64_sra(int64_t a, int amt)
 
 /* ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~- */
 
-int 
+int
 main(void)
 {
   int             i, j, failed = 0;
   const char     *something_failed = "  %d tests failed.\n";
   const char     *all_tests_passed = "  All tests passed.\n";
 
-  printf("a = %16lld (0x%016llx)\n", a, a);
-  printf("b = %16lld (0x%016llx)\n", b, b);
-  printf("c = %16lld (0x%016llx)\n", c, c);
-  printf("d = %16lld (0x%016llx)\n", d, d);
-  printf("e = %16lld (0x%016llx)\n", e, e);
-  printf("f = %16lld (0x%016llx)\n", f, f);
+  printf("a = %16lld (0x%016llx)\n", tval_a, tval_a);
+  printf("b = %16lld (0x%016llx)\n", tval_b, tval_b);
+  printf("c = %16lld (0x%016llx)\n", tval_c, tval_c);
+  printf("d = %16lld (0x%016llx)\n", tval_d, tval_d);
+  printf("e = %16lld (0x%016llx)\n", tval_e, tval_e);
+  printf("f = %16lld (0x%016llx)\n", tval_f, tval_f);
   printf("----------------------------------------\n");
 
   for (i = 0; i < ARR_SIZE(int64_preds); ++i) {
@@ -319,22 +453,22 @@ main(void)
     printf("----------------------------------------\n");
   }
 
-  printf("a                = 0x%016llx\n", a);
-  printf("i64_shl_const(a) = 0x%016llx\n", i64_shl_const(a));
-  printf("i64_shl(a)       = 0x%016llx\n", i64_shl(a, 10));
-  printf("i64_srl_const(a) = 0x%016llx\n", i64_srl_const(a));
-  printf("i64_srl(a)       = 0x%016llx\n", i64_srl(a, 10));
-  printf("i64_sra_const(a) = 0x%016llx\n", i64_sra_const(a));
-  printf("i64_sra(a)       = 0x%016llx\n", i64_sra(a, 10));
+  printf("a                = 0x%016llx\n", tval_a);
+  printf("i64_shl_const(a) = 0x%016llx\n", i64_shl_const(tval_a));
+  printf("i64_shl(a)       = 0x%016llx\n", i64_shl(tval_a, 10));
+  printf("i64_srl_const(a) = 0x%016llx\n", i64_srl_const(tval_a));
+  printf("i64_srl(a)       = 0x%016llx\n", i64_srl(tval_a, 10));
+  printf("i64_sra_const(a) = 0x%016llx\n", i64_sra_const(tval_a));
+  printf("i64_sra(a)       = 0x%016llx\n", i64_sra(tval_a, 10));
   printf("----------------------------------------\n");
 
-  printf("f                = 0x%016llx\n", f);
-  printf("i64_shl_const(f) = 0x%016llx\n", i64_shl_const(f));
-  printf("i64_shl(f)       = 0x%016llx\n", i64_shl(f, 10));
-  printf("i64_srl_const(f) = 0x%016llx\n", i64_srl_const(f));
-  printf("i64_srl(f)       = 0x%016llx\n", i64_srl(f, 10));
-  printf("i64_sra_const(f) = 0x%016llx\n", i64_sra_const(f));
-  printf("i64_sra(f)       = 0x%016llx\n", i64_sra(f, 10));
+  printf("f                = 0x%016llx\n", tval_f);
+  printf("i64_shl_const(f) = 0x%016llx\n", i64_shl_const(tval_f));
+  printf("i64_shl(f)       = 0x%016llx\n", i64_shl(tval_f, 10));
+  printf("i64_srl_const(f) = 0x%016llx\n", i64_srl_const(tval_f));
+  printf("i64_srl(f)       = 0x%016llx\n", i64_srl(tval_f, 10));
+  printf("i64_sra_const(f) = 0x%016llx\n", i64_sra_const(tval_f));
+  printf("i64_sra(f)       = 0x%016llx\n", i64_sra(tval_f, 10));
   printf("----------------------------------------\n");
 
   return 0;