[PATCH] sparse, llvm: More comparison ops code generation

[PATCH] sparse, llvm: More comparison ops code generation

[Pekka Enberg]

This patch implements LLVM code generation for OP_SET_LE, OP_SET_GE, OP_SET_BE,
and OP_SET_AE.

Cc: Christopher Li <sparse@chrisli.org>
Cc: Jeff Garzik <jgarzik@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---
 sparse-llvm.c                |    8 ++++----
 validation/backend/cmp-ops.c |   20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/sparse-llvm.c b/sparse-llvm.c
index 6402666..700a7a4 100644
--- a/sparse-llvm.c
+++ b/sparse-llvm.c
@@ -502,10 +502,10 @@ static void output_op_binary(struct function *fn, struct instruction *insn)
 		target = LLVMBuildICmp(fn->builder, LLVMIntNE, lhs, rhs, target_name);
 		break;
 	case OP_SET_LE:
-		assert(0);
+		target = LLVMBuildICmp(fn->builder, LLVMIntSLE, lhs, rhs, target_name);
 		break;
 	case OP_SET_GE:
-		assert(0);
+		target = LLVMBuildICmp(fn->builder, LLVMIntSGE, lhs, rhs, target_name);
 		break;
 	case OP_SET_LT:
 		assert(!symbol_is_fp_type(insn->type));
@@ -522,10 +522,10 @@ static void output_op_binary(struct function *fn, struct instruction *insn)
 		target = LLVMBuildICmp(fn->builder, LLVMIntUGT, lhs, rhs, target_name);
 		break;
 	case OP_SET_BE:
-		assert(0);
+		target = LLVMBuildICmp(fn->builder, LLVMIntULE, lhs, rhs, target_name);
 		break;
 	case OP_SET_AE:
-		assert(0);
+		target = LLVMBuildICmp(fn->builder, LLVMIntUGE, lhs, rhs, target_name);
 		break;
 	default:
 		assert(0);
diff --git a/validation/backend/cmp-ops.c b/validation/backend/cmp-ops.c
index b1ad227..7bbc81c 100644
--- a/validation/backend/cmp-ops.c
+++ b/validation/backend/cmp-ops.c
@@ -18,6 +18,16 @@ static int setg(int x, int y)
 	return x > y;
 }
 
+static int setle(int x, int y)
+{
+	return x <= y;
+}
+
+static int setge(int x, int y)
+{
+	return x >= y;
+}
+
 static int setb(unsigned int x, unsigned int y)
 {
 	return x < y;
@@ -28,6 +38,16 @@ static int seta(unsigned int x, unsigned int y)
 	return x > y;
 }
 
+static int setbe(unsigned int x, unsigned int y)
+{
+	return x <= y;
+}
+
+static int setae(unsigned int x, unsigned int y)
+{
+	return x >= y;
+}
+
 /*
  * check-name: Comparison operator code generation
  * check-command: ./sparsec -c $file -o tmp.o
-- 
1.7.6.4

Re: [PATCH] sparse, llvm: More comparison ops code generation

[Linus Torvalds]

On Tue, Nov 22, 2011 at 9:40 AM, Pekka Enberg <penberg@kernel.org> wrote:
> This patch implements LLVM code generation for OP_SET_LE, OP_SET_GE, OP_SET_BE,
> and OP_SET_AE.

Ugh.

Can't you just do it with a single statement like

    target = LLVMBuildICmp(fn->builder, translate_op(op), lhs, rhs,
target_name);

instead of having that case-statement where every case does the same thing?

The translate_op() thing should be trivial too, just something like

   static int translate_op(int sparse_op)
   {
       static const int trans_tbl[] = {
           .[OP_SET_LE] = LLVMIntSLE,
       ...
        };
        return trans_tbl[sparse_op];
   }

or whatever. No?

                 Linus