HDLRuby 2.6.25 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a207f3222cab832d2b846f9658ea0cf9426e77afd14196c2db8cb6832bd4ebda
-  data.tar.gz: 490c8a6400d6faac77cec5ab1e49caa3abd94d4d0961521ec14d485cad640b72
+  metadata.gz: 4ca0e2aba73e7ceb55e145dd22286398ae7605d04d46212f870ba895d3f983d9
+  data.tar.gz: 434ae3eb4d974a00ea1510b0e23d66dc51d5f6ac5ef0e4b79af288b5d05f6985
 SHA512:
-  metadata.gz: '08196d385fb34444cc7387f6b4982063c38e98e10e51e3b58551b0a6b62dac6921fcbb9c7a89aaccabea055ecab0d2da0543667f688d52bd7ea6b875d9db5ebd'
-  data.tar.gz: c22296c840a2a7a52b8f4bd8bc34dc38c53f571feba0a01f1bb17a2f548c2965947916fcf47b95b33f2293f1481d8b91653d855c21708a746245cebffebc72f4
+  metadata.gz: d097cbd7793ef60fd94c70f7a8acb2e49b13915fd799b7618523c1ba57300195a9ca8a7a61d6e50a8f89779ce6bf64a484bdf5267de93b3159f61186f40e6a82
+  data.tar.gz: 27db7c7e988abe14635a515572c2774e8a76d44e7f0e85bfb6ec8b1c9dfed85f61ef49e1f597c59fc9b725b6aacc53b976f73a3b49f816820c5ca9691e253559

data/lib/HDLRuby/hdr_samples/with_ref_array.rb

@@ -0,0 +1,26 @@
+
+# A benchmark for testing array references.
+system :with_concat do
+    [8].inner :count
+    [8].inner :val0,:val1
+    [3].inner :val2
+    [8].inner :val3
+
+    val2 <= val0[4..2]
+    val3[6..3] <= val1[7..4]
+
+    timed do
+        val0 <= _00001111
+        val1 <= _11000011
+        count <= 0
+        !10.ns
+        val0 <= _11110000
+        val1 <= _00111100
+        count <= 1
+        !10.ns
+        val0 <= _10101010
+        val1 <= _01010101
+        count <= 2
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/with_subsums.rb

@@ -0,0 +1,33 @@
+
+# A benchmark for sum of sub parts of a vector.
+system :with_concat do
+    [8].inner :count
+    [16].inner :val0, :val1, :val2, :val3, :val4, :val5, :val6
+    bs = []
+    10.times do |i|
+        bs << [16].inner(:"b#{i}")
+    end
+
+    vals = [val1,val2,val3,val4]
+    par do
+        vals.each.with_index { |val,i| val <= val0[(i*4+3)..i*4] }
+    end
+    val5 <= vals.reduce(:+)
+
+    par do
+        bs.each.with_index { |b,i| b <= val0[i..i] }
+    end
+    val6 <= bs.reduce(:+)
+
+    timed do
+        val0 <= _1111000011110000
+        count <= 0
+        !10.ns
+        val0 <= _0000111100001111
+        count <= 1
+        !10.ns
+        val0 <= _1010101010101010
+        count <= 2
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/with_values.rb

@@ -0,0 +1,58 @@
+
+# A benchmark for testing the literal values.
+system :with_values do
+    inner :v1
+    [8].inner :v8
+    [16].inner :v16
+    [32].inner :v32
+    [56].inner :v56
+    [64].inner :v64
+    [96].inner :v96
+
+
+    timed do
+        v1  <= 0
+        v8  <= 0
+        v16 <= 0
+        v32 <= 0
+        v56 <= 0
+        v64 <= 0
+        v96 <= 0
+        !10.ns
+        v1  <= 1
+        v8  <= 1
+        v16 <= 1
+        v32 <= 1
+        v56 <= 1
+        v64 <= 1
+        v96 <= 1
+        !10.ns
+        v8  <= 128
+        v16 <= 128
+        v32 <= 128
+        v56 <= 128
+        v64 <= 128
+        v96 <= 128
+        !10.ns
+        v16 <= 0x1000
+        v32 <= 0x1000
+        v56 <= 0x1000
+        v64 <= 0x1000
+        v96 <= 0x1000
+        !10.ns
+        v32 <= 0x10000000
+        v56 <= 0x10000000
+        v64 <= 0x10000000
+        v96 <= 0x10000000
+        !10.ns
+        v56 <= 0x10000000000000
+        v64 <= 0x10000000000000
+        v96 <= 0x10000000000000
+        !10.ns
+        v64 <= 0x1000000000000000
+        v96 <= 0x1000000000000000
+        !10.ns
+        v96 <= 0x1000000000000000000
+        !10.ns
+    end
+end

data/lib/HDLRuby/hruby_low2c.rb

@@ -1360,7 +1360,7 @@ module HDLRuby::Low
         # def to_c(level = 0)
         def to_c(res,level = 0)
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Generate the print for each argument.
             self.each_arg do |arg|
                 if (arg.is_a?(StringE)) then
@@ -1981,7 +1981,7 @@ module HDLRuby::Low
                 res << " " * (level+1)*3
                 # res << "static unsigned long long data[] = { "
                 res << "static unsigned int data[] = { "
-                res << str.scan(/.{1,#{Low2C.int_width}}/m).map do |sub|
+                res << str.scan(/.{1,#{Low2C.int_width}}/m).reverse.map do |sub|
                     sub.to_i(2).to_s # + "ULL"
                 end.join(",")
                 res << " };\n"
@@ -2056,7 +2056,7 @@ module HDLRuby::Low
         # def to_c(level = 0)
         def to_c(res,level = 0)
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Generate the child.
             self.child.to_c(res,level)
             res << (" " * (level*3))
@@ -2144,7 +2144,7 @@ module HDLRuby::Low
             end
             # Some computation required.
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Generate the child.
             self.child.to_c(res,level)
             res << (" " * (level*3))
@@ -2256,7 +2256,7 @@ module HDLRuby::Low
         # def to_c(level = 0)
         def to_c(res, level = 0)
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Generate the left computation.
             self.left.to_c(res,level)
             # Generate the right computation.
@@ -2375,7 +2375,7 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         def to_c(res,level = 0)
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Gather the possible selection choices.
             expressions = self.each_choice.to_a
             # Create the resulting string.
@@ -2444,7 +2444,7 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         def to_c(res,level = 0)
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Gather the content to concat.
             expressions = self.each_expression.to_a
             # Compute each sub expression.
@@ -2604,7 +2604,7 @@ module HDLRuby::Low
         # +left+ tells if it is a left value or not.
         def to_c(res,level = 0, left = false)
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Compute the reference.
             self.ref.to_c(res,level)
             # Compute the index.
@@ -2718,7 +2718,7 @@ module HDLRuby::Low
         # end
         def to_c(res,level = 0, left = false)
             # Save the value pool state.
-            res << (" " * (level*3)) << "SV;\n"
+            res << (" " * (level*3)) << "PV;\n"
             # Compute the reference.
             self.ref.to_c(res,level)
             # res << (" " * (level*3))

data/lib/HDLRuby/sim/hruby_sim.h

@@ -410,7 +410,8 @@ extern void save_value_pos();
 extern void restore_value_pos();
 
 /** Macros for short control of the pool of values. */
-#define SV get_value();save_value_pos();
+#define SV save_value_pos();
+#define PV push(get_value());save_value_pos();
 #define RV restore_value_pos();
 
 
@@ -757,6 +758,10 @@ extern void push(Value val);
  *  @return the value. */
 extern Value pop();
 
+/** Access the top value of the stack without removing it.
+ *  @return the value. */
+extern Value peek();
+
 /** Unary calculation.
  *  @param oper the operator function
  *  @return the destination

data/lib/HDLRuby/sim/hruby_sim_stack_calc.c

@@ -38,6 +38,17 @@ Value pop() {
     }
 }
 
+/** Access the top value of the stack without removing it.
+ *  @return the value. */
+Value peek() {
+    if (head < STACK_SIZE) {
+        return stack[head];
+    } else {
+        perror("Computation stack empty.\n");
+        exit(1);
+    }
+}
+
 /** Pops multiple values.
  *  @param num the number of values to pop.
  *  @return a pointer on the first value (in heap order!). */
@@ -58,10 +69,11 @@ static Value* popn(int num) {
  **/
 Value unary(Value (*oper)(Value,Value)) {
     // printf("unary\n");
-    Value dst = get_top_value();
-    dst = oper(pop(),dst);
-    push(dst);
-    return dst;
+    // Value dst = get_top_value();
+    // dst = oper(pop(),dst);
+    // push(dst);
+    // return dst;
+    return oper(pop(),peek());
 }
 
 /** Binary calculation.
@@ -70,12 +82,15 @@ Value unary(Value (*oper)(Value,Value)) {
  **/
 Value binary(Value (*oper)(Value,Value,Value)) {
     // printf("binary\n");
-    Value dst = get_top_value();
+    // Value dst = get_top_value();
+    // Value r = pop();
+    // Value l = pop();
+    // dst = oper(l,r,dst);
+    // push(dst);
+    // return dst;
     Value r = pop();
     Value l = pop();
-    dst = oper(l,r,dst);
-    push(dst);
-    return dst;
+    return oper(l,r,peek());
 }
 
 /** Cast calculation.
@@ -84,72 +99,93 @@ Value binary(Value (*oper)(Value,Value,Value)) {
  **/
 Value cast(Type typ) {
     // printf("cast\n"); 
-    Value dst = get_top_value();
-    Value src = pop();
-    dst = cast_value(src,typ,dst);
-    push(dst);
-    return dst;
+    // Value dst = get_top_value();
+    // Value src = pop();
+    // dst = cast_value(src,typ,dst);
+    // push(dst);
+    // return dst;
+    return cast_value(pop(),typ,peek());
 }
 
 /* Concat values.
  * @param num the number of values to concat.
  * @param dir the direction. */
 Value sconcat(int num, int dir) {
+    // Value* vals = alloca(num*sizeof(Value));
+    // Value dst = get_top_value();
+    // int i;
+    // // printf("sconcat\n");
+    // /* Get the values to concat from the stack. */
+    // for(i=1;i<=num;++i) vals[num-i] = pop();
+    // dst = concat_valueP(num,dir,dst,vals);
+    // push(dst);
+    // return dst;
     Value* vals = alloca(num*sizeof(Value));
-    Value dst = get_top_value();
     int i;
     // printf("sconcat\n");
     /* Get the values to concat from the stack. */
     for(i=1;i<=num;++i) vals[num-i] = pop();
-    dst = concat_valueP(num,dir,dst,vals);
-    push(dst);
-    return dst;
+    return concat_valueP(num,dir,peek(),vals);
 }
 
 /* Index read calculation.
  * @param typ the data type of the access. */
 Value sreadI(Type typ) {
+    // // printf("sreadI\n");
+    // Value dst = get_top_value();
+    // unsigned long long idx = value2integer(pop());
+    // dst = read_range(pop(),idx,idx,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("sreadI\n");
-    Value dst = get_top_value();
     unsigned long long idx = value2integer(pop());
-    dst = read_range(pop(),idx,idx,typ,dst);
-    push(dst);
-    return dst;
+    return read_range(pop(),idx,idx,typ,peek());
 }
 
 /* Index write calculation.
  * @param typ the data type of the access. */
 Value swriteI(Type typ) {
+    // // printf("swriteI\n");
+    // Value dst = get_top_value();
+    // unsigned long long idx = value2integer(pop());
+    // dst = write_range(pop(),idx,idx,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("swriteI\n");
-    Value dst = get_top_value();
     unsigned long long idx = value2integer(pop());
-    dst = write_range(pop(),idx,idx,typ,dst);
-    push(dst);
-    return dst;
+    return write_range(pop(),idx,idx,typ,peek());
 }
 
 /* Range read calculation.
  * @param typ the data type of the access. */
 Value sreadR(Type typ) {
+    // // printf("sreadR\n");
+    // Value dst = get_top_value();
+    // unsigned long long last = value2integer(pop());
+    // unsigned long long first = value2integer(pop());
+    // dst = read_range(pop(),first,last,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("sreadR\n");
-    Value dst = get_top_value();
     unsigned long long last = value2integer(pop());
     unsigned long long first = value2integer(pop());
-    dst = read_range(pop(),first,last,typ,dst);
-    push(dst);
-    return dst;
+    return read_range(pop(),first,last,typ,peek());
 }
 
 /* Range write calculation.
  * @param typ the data type of the access. */
 Value swriteR(Type typ) {
+    // // printf("swriteR\n");
+    // Value dst = get_top_value();
+    // unsigned long long last = value2integer(pop());
+    // unsigned long long first = value2integer(pop());
+    // dst = write_range(pop(),first,last,typ,dst);
+    // push(dst);
+    // return dst;
     // printf("swriteR\n");
-    Value dst = get_top_value();
     unsigned long long last = value2integer(pop());
     unsigned long long first = value2integer(pop());
-    dst = write_range(pop(),first,last,typ,dst);
-    push(dst);
-    return dst;
+    return write_range(pop(),first,last,typ,peek());
 }
 
 /** Check if the top value is defined. */

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.25"
+  VERSION = "2.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.25
+  version: 2.7.1
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,9 +157,12 @@ files:
 - lib/HDLRuby/hdr_samples/with_multi_channels.rb
 - lib/HDLRuby/hdr_samples/with_reconf.rb
 - lib/HDLRuby/hdr_samples/with_reduce.rb
+- lib/HDLRuby/hdr_samples/with_ref_array.rb
 - lib/HDLRuby/hdr_samples/with_str2value.rb
+- lib/HDLRuby/hdr_samples/with_subsums.rb
 - lib/HDLRuby/hdr_samples/with_to_a.rb
 - lib/HDLRuby/hdr_samples/with_to_array.rb
+- lib/HDLRuby/hdr_samples/with_values.rb
 - lib/HDLRuby/hdrcc.rb
 - lib/HDLRuby/high_samples/_adder_fault.rb
 - lib/HDLRuby/high_samples/_generic_transmission2.rb