From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 17 Jun 2014 10:47:51 +0000 (+0200)
Subject: Improved handling of relational op of real values
X-Git-Tag: yosys-0.4~588
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=798ff88855a6e9b8eb82a48fb4d39f78807200d9;p=yosys.git

Improved handling of relational op of real values
---

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 7be287d19..7a98e2712 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1538,15 +1538,16 @@ skip_dynamic_range_lvalue_expansion:;
 				newNode = mkconst_bits(y.bits, false);
 			} else
 			if (children[0]->isConst() && children[1]->isConst()) {
+				bool cmp_signed = (children[0]->type == AST_REALVALUE || children[0]->is_signed) && (children[1]->type == AST_REALVALUE || children[1]->is_signed);
 				switch (type) {
-				case AST_LT:  newNode = mkconst_int(children[0]->asReal(sign_hint) <  children[1]->asReal(sign_hint), false, 1); break;
-				case AST_LE:  newNode = mkconst_int(children[0]->asReal(sign_hint) <= children[1]->asReal(sign_hint), false, 1); break;
-				case AST_EQ:  newNode = mkconst_int(children[0]->asReal(sign_hint) == children[1]->asReal(sign_hint), false, 1); break;
-				case AST_NE:  newNode = mkconst_int(children[0]->asReal(sign_hint) != children[1]->asReal(sign_hint), false, 1); break;
-				case AST_EQX: newNode = mkconst_int(children[0]->asReal(sign_hint) == children[1]->asReal(sign_hint), false, 1); break;
-				case AST_NEX: newNode = mkconst_int(children[0]->asReal(sign_hint) != children[1]->asReal(sign_hint), false, 1); break;
-				case AST_GE:  newNode = mkconst_int(children[0]->asReal(sign_hint) >= children[1]->asReal(sign_hint), false, 1); break;
-				case AST_GT:  newNode = mkconst_int(children[0]->asReal(sign_hint) >  children[1]->asReal(sign_hint), false, 1); break;
+				case AST_LT:  newNode = mkconst_int(children[0]->asReal(cmp_signed) <  children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_LE:  newNode = mkconst_int(children[0]->asReal(cmp_signed) <= children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_EQ:  newNode = mkconst_int(children[0]->asReal(cmp_signed) == children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_NE:  newNode = mkconst_int(children[0]->asReal(cmp_signed) != children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_EQX: newNode = mkconst_int(children[0]->asReal(cmp_signed) == children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_NEX: newNode = mkconst_int(children[0]->asReal(cmp_signed) != children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_GE:  newNode = mkconst_int(children[0]->asReal(cmp_signed) >= children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_GT:  newNode = mkconst_int(children[0]->asReal(cmp_signed) >  children[1]->asReal(cmp_signed), false, 1); break;
 				default: log_abort();
 				}
 			}
diff --git a/tests/realmath/generate.py b/tests/realmath/generate.py
index 9e48755c5..53015381e 100644
--- a/tests/realmath/generate.py
+++ b/tests/realmath/generate.py
@@ -43,11 +43,15 @@ for idx in range(100):
     with file('temp/uut_%05d.v' % idx, 'w') as f, redirect_stdout(f):
         print('module uut_%05d(output [63:0] %s);\n' % (idx, ', '.join(['y%02d' % i for i in range(100)])))
         for i in range(30):
-            print('localparam p%02d = %s;' % (i, random_expression()))
-            # print('localparam%s p%02d = %s;' % (random.choice(['', ' real', ' integer']), i, random_expression()))
+            if idx < 10 or True:
+                print('localparam p%02d = %s;' % (i, random_expression()))
+            else:
+                print('localparam%s p%02d = %s;' % (random.choice(['', ' real', ' integer']), i, random_expression()))
         for i in range(30, 60):
-            print('localparam p%02d = %s;' % (i, random_expression(maxparam = 30)))
-            # print('localparam%s p%02d = %s;' % (random.choice(['', ' real', ' integer']), i, random_expression(maxparam = 30)))
+            if idx < 10 or True:
+                print('localparam p%02d = %s;' % (i, random_expression(maxparam = 30)))
+            else:
+                print('localparam%s p%02d = %s;' % (random.choice(['', ' real', ' integer']), i, random_expression(maxparam = 30)))
         for i in range(100):
             print('assign y%02d = 65536 * (%s);' % (i, random_expression(maxparam = 60)))
         print('endmodule')