HDLRuby 3.8.2 → 3.9.0

data/ext/hruby_sim/hruby_sim_calc.c

@@ -854,12 +854,12 @@ static Value greater_value_numeric_defined_bitstring(Value src0, Value src1, Val
     long long width0 = type_width(src0->type);
     long long width1 = type_width(src1->type);
     long long width = width0>width1 ? width0 : width1;
-    if (src0->type->flags.sign && (src0_int & (1 << (width0-1)))) {
+    if (src0->type->flags.sign && (src0_int & (1LL << (width0-1)))) {
         if(src1->type->flags.sign && (src1_data[width1-1] == '1')) {
             /* Negative-negative comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '1' : 
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '1' : src1_data[i];
                 if (d0 < d1) {
                     dst->data_int = 0;
@@ -883,7 +883,7 @@ static Value greater_value_numeric_defined_bitstring(Value src0, Value src1, Val
             /* Positive-positive comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '0' : 
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '0' : src1_data[i];
                 if (d0 < d1) {
                     dst->data_int = 0;
@@ -974,15 +974,16 @@ static Value lesser_value_numeric_defined_bitstring(Value src0, Value src1, Valu
 
     unsigned long long src0_int = src0->data_int;
     char* src1_data = src1->data_str;
+    // printf("src1_data=%s\n",src1_data);
     long long width0 = type_width(src0->type);
     long long width1 = type_width(src1->type);
     long long width = width0>width1 ? width0 : width1;
-    if (src0->type->flags.sign && (src0_int & (1 << (width0-1)))) {
+    if (src0->type->flags.sign && (src0_int & (1LL << (width0-1)))) {
         if(src1->type->flags.sign && src1_data[width1-1] == '1') {
             /* Negative-negative comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '1' : 
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '1' : src1_data[i];
                 if (d0 < d1) {
                     dst->data_int = 1;
@@ -1006,8 +1007,9 @@ static Value lesser_value_numeric_defined_bitstring(Value src0, Value src1, Valu
             /* Positive-positive comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '0' :
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '0' : src1_data[i];
+                // printf("%d: d0=%d d1=%d\n",i,d0,d1);
                 if (d0 < d1) {
                     dst->data_int = 1;
                     return dst;
@@ -1100,12 +1102,12 @@ static Value greater_equal_value_numeric_defined_bitstring(Value src0, Value src
     long long width0 = type_width(src0->type);
     long long width1 = type_width(src1->type);
     long long width = width0>width1 ? width0 : width1;
-    if (src0->type->flags.sign && (src0_int & (1 <<(width0-1)))) {
+    if (src0->type->flags.sign && (src0_int & (1LL <<(width0-1)))) {
         if(src1->type->flags.sign && src1_data[width1-1] == '1') {
             /* Negative-negative comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '1' :
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '1' : src1_data[i];
                 if (d0 < d1) {
                     dst->data_int = 0;
@@ -1129,7 +1131,7 @@ static Value greater_equal_value_numeric_defined_bitstring(Value src0, Value src
             /* Positive-positive comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '0' : 
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '0' : src1_data[i];
                 if (d0 < d1) {
                     dst->data_int = 0;
@@ -1223,12 +1225,12 @@ static Value lesser_equal_value_numeric_defined_bitstring(Value src0, Value src1
     long long width0 = type_width(src0->type);
     long long width1 = type_width(src1->type);
     long long width = width0>width1 ? width0 : width1;
-    if (src0->type->flags.sign && (src0_int & (1 << (width0-1)))) {
+    if (src0->type->flags.sign && (src0_int & (1LL << (width0-1)))) {
         if(src1->type->flags.sign && src1_data[width1-1] == '1') {
             /* Negative-negative comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '1' :
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '1' : src1_data[i];
                 if (d0 < d1) {
                     dst->data_int = 1;
@@ -1252,7 +1254,7 @@ static Value lesser_equal_value_numeric_defined_bitstring(Value src0, Value src1
             /* Positive-positive comparison. */
             for(long long i=width-1; i >= 0; --i) {
                 char d0 = i >= width0 ? '0' :
-                    ((src0_int & (1 << i)) ? '1' : '0');
+                    ((src0_int & (1LL << i)) ? '1' : '0');
                 char d1 = i >= width1 ? '0' : src1_data[i];
                 // printf("d0=%c d1=%c\n",d0,d1);
                 if (d0 < d1) {
@@ -3297,6 +3299,7 @@ Value not_equal_value_c(Value src0, Value src1, Value dst) {
  *  @param dst the destination value
  *  @return dst */
 Value greater_value(Value src0, Value src1, Value dst) {
+    // printf("greater_value\n");
     /* Might allocate a new value so save the current pool state. */
     // unsigned int pos = get_value_pos();
     /* Do a numeric computation if possible, otherwise fallback to bitstring
@@ -3308,7 +3311,8 @@ Value greater_value(Value src0, Value src1, Value dst) {
         if (src0->numeric)
             return greater_value_numeric_defined_bitstring(src0,src1,dst);
         if (src1->numeric)
-            return lesser_equal_value_numeric_defined_bitstring(src1,src0,dst);
+            // return lesser_equal_value_numeric_defined_bitstring(src1,src0,dst);
+            return lesser_value_numeric_defined_bitstring(src1,src0,dst);
         /* Both sources can be converted to numeric values. */
         return greater_value_defined_bitstring(src0,src1,dst);
     } else {
@@ -3340,7 +3344,8 @@ Value lesser_value(Value src0, Value src1, Value dst) {
         if (src0->numeric)
             return lesser_value_numeric_defined_bitstring(src0,src1,dst);
         if (src1->numeric)
-            return greater_equal_value_numeric_defined_bitstring(src1,src0,dst);
+            // return greater_equal_value_numeric_defined_bitstring(src1,src0,dst);
+            return greater_value_numeric_defined_bitstring(src1,src0,dst);
         return lesser_value_defined_bitstring(src0,src1,dst);
     } else {
         /* Cannot compute (for now), simply undefines the destination. */
@@ -3371,7 +3376,8 @@ Value greater_equal_value(Value src0, Value src1, Value dst) {
         if (src0->numeric)
             return greater_equal_value_numeric_defined_bitstring(src0,src1,dst);
         if (src1->numeric)
-            return lesser_value_numeric_defined_bitstring(src1,src0,dst);
+            // return lesser_value_numeric_defined_bitstring(src1,src0,dst);
+            return lesser_equal_value_numeric_defined_bitstring(src1,src0,dst);
         return greater_equal_value_defined_bitstring(src0,src1,dst);
     } else {
         /* Cannot compute (for now), simply undefines the destination. */
@@ -3401,7 +3407,8 @@ Value lesser_equal_value(Value src0, Value src1, Value dst) {
         if (src0->numeric)
             return lesser_equal_value_numeric_defined_bitstring(src0,src1,dst);
         if (src1->numeric)
-            return greater_value_numeric_defined_bitstring(src1,src0,dst);
+            // return greater_value_numeric_defined_bitstring(src1,src0,dst);
+            return greater_equal_value_numeric_defined_bitstring(src1,src0,dst);
         return lesser_equal_value_defined_bitstring(src0,src1,dst);
     } else {
         /* Cannot compute (for now), simply undefines the destination. */

data/lib/HDLRuby/hdr_samples/comparison_bench.rb

@@ -2,6 +2,25 @@
 
 # A benchmark for the comparators.
 system :comparison_bench do
+
+    [8].inner truc: _h00
+    [8].inner :machin, :macheq
+
+    machin <= (truc > 0)
+    macheq <= (truc >= 0)
+
+    [8].inner bidule: _h00
+    [8].inner :chose, :choeq
+
+    chose <= (bidule < 0)
+    choeq <= (bidule <= 0)
+
+    [8].inner two: _h02
+    [8].inner :twoc, :twod
+
+    twoc <= (two > 1)
+    twod <= (two < 3)
+
     [8].inner :x, :y
     signed[8].inner :u,:v
     inner :ue, :ult, :ule, :ugt, :uge
@@ -63,6 +82,23 @@ system :comparison_bench do
         sgeND <= (uND >= vND)
     end
 
+    inner :ueC, :ultC, :uleC, :ugtC, :ugeC
+    inner :seC, :sltC, :sleC, :sgtC, :sgeC
+
+    par do
+        ueC  <= (x == 0)
+        ultC <= (x < 0)
+        uleC <= (x <= 0)
+        ugtC <= (x > 0)
+        ugeC <= (x >= 0)
+
+        seC  <= (u == 0)
+        sltC <= (u < 0)
+        sleC <= (u <= 0)
+        sgtC <= (u > 0)
+        sgeC <= (u >= 0)
+    end
+
 
     timed do
         x <= 0

data/lib/HDLRuby/hdr_samples/with_henumerable.rb

@@ -129,7 +129,7 @@ system :henmerable_checks do
 
     [8].inner :res23, :res24
 
-    res23 <= vals.hfind(proc {-1}) { |elem| elem > _h00 }
+    res23 <= vals.hfind(proc {-1}) { |elem| elem > 0 }
 
     par(clk.posedge) do
       # hprint("=0\n")
@@ -201,12 +201,16 @@ system :henmerable_checks do
     end
 
     [8].inner :res35, :res36
+    [7].inner :res35X, :res36X
 
     res35 <= vals.hinject(_h01) { |a,b| a+b }
 
+    res35X <= vals.hinject(bit[4]) { |a,b| a+b }
+
     par(clk.posedge) do
       # hprint(":0\n")
       res36 <= vals.(:+)
+      res36X <= vals.(bit[4],:+)
     end
 
     [8].inner :res37

data/lib/HDLRuby/hdr_samples/with_reduce.rb

@@ -1,38 +1,38 @@
 
 
-# A benchmark for testing the enumarable properties of expression (reduce).
-system :with_reduce_bench do
+# A benchmark for testing the enumarable properties of expression (hreduce).
+system :with_hreduce_bench do
     [8].inner :val,:res
     [64].inner :val64
 
     timed do
         val <= _b01101010
-        res <= val.reduce(_b00000000,:+)
+        res <= val.hreduce(_b00000000,:+)
         !10.ns
         val <= _01010010
-        res <= val.reduce(_b00000000,:+)
+        res <= val.hreduce(_b00000000,:+)
         !10.ns
         val <= _01101111
-        res <= val.reduce(_b00000000,:+)
+        res <= val.hreduce(_b00000000,:+)
         !10.ns
         val64 <= _b0110101001101010011010100110101001101010011010100110101001101010
-        res <= val64.reduce(_b00000000,:+)
+        res <= val64.hreduce(_b00000000,:+)
         !10.ns
         res <= val64[7..0]
         !10.ns
-        res <= res.reduce(_b00000000,:+)
+        res <= res.hreduce(_b00000000,:+)
         !10.ns
         res <= val64[63..60]
         !10.ns
-        res <= res.reduce(_b00000000,:+)
+        res <= res.hreduce(_b00000000,:+)
         !10.ns
         val64 <= ~(val64 ^ val64)
-        res <= val64.reduce(_b00000000,:+)
+        res <= val64.hreduce(_b00000000,:+)
         !10.ns
         val64[0] <= _b0
         val64[3] <= _b0
         val64[63] <= _b0
-        res <= val64.reduce(_b00000000,:+)
+        res <= val64.hreduce(_b00000000,:+)
         !10.ns
     end
 end

data/lib/HDLRuby/hdr_samples/with_sequencer_enumerable.rb

@@ -164,7 +164,7 @@ system :my_seqencer do
         # hprint("=0\n")
         res13 <= 0
         res14 <= 0
-        res13 <= vals.sfind(-1) { |elem| elem > 0 }
+        res13 <= vals.sfind(-1) { |elem| elem > _h00 }
         res14 <= vals.sfind(-1) { |elem| elem == _hAA }
         # hprint("=1 res13=",res13," res14=",res14,"\n")
     end
@@ -239,6 +239,7 @@ system :my_seqencer do
     end
 
     [8].inner :res26, :res27
+    [7].inner :res26X, :res27X
 
     sequencer(clk.posedge,rst) do
         # hprint(":0\n")
@@ -246,6 +247,8 @@ system :my_seqencer do
         res27 <= 0
         res26 <= vals.sinject(_h01) { |a,b| a+b }
         res27 <= vals.sinject(:+)
+        res26X <= vals.sinject(bit[4]) { |a,b| a+b }
+        res27X <= vals.sinject(bit[4],:+)
         # hprint(":1 res26=",res26," res27=",res27,"\n")
     end