HDLRuby 2.6.19 → 2.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 752424361455f2bd949a8f90c9802337f3ce1d853ebff6bfa44bbe25ebeda369
-  data.tar.gz: f9c2dd84c0c875c423a94211948beaea44b54bfe234c01d6f35716b7df26053c
+  metadata.gz: 1568bd314caee471d78b83b882b7c89ad778642a4a026de691209318bf3f5a00
+  data.tar.gz: 6d1829e1f8d04fb8592d68faf1b12affccf487a94a86275f932bef8676c542a6
 SHA512:
-  metadata.gz: cc71caee7a2435e579b533b4cbba22c6bc9ca9e8e75be4e57d4a629b7a467ac28a2a302f6d53cf7552a1c1f115e17f5ec7b7648eadc482ab62bc2fdff1319cc6
-  data.tar.gz: 4053a2050e82212db5901c7cb4756b21bca3465ec9ee4d08cd2875d8b57e5c53cd05df0405e2f5b249ec96b28271f514c8707fbb43b8e69db901ff9713a9b1f4
+  metadata.gz: ded7ab60f18f80344d244274c354e85eda76150804bdb31598d801d803c33e0d63cc4786becdff7a3bff63a93b98d3837256638fe76ed993384998f56484846c
+  data.tar.gz: 52c1fabe48cacabad8692f7eacd00c3ced295e2963ec29c3f5235cf27ff99a8826b12e2d525bc2d4b86703967dcbe2fe10bdb47c20127f84c04ea8875ae39277

data/lib/HDLRuby/hdr_samples/with_reduce.rb

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

data/lib/HDLRuby/hruby_low2c.rb

@@ -1575,9 +1575,10 @@ module HDLRuby::Low
             if str =~ /^[01]+$/ && str.length <= 64 then
                 # Yes, generate a numeral value.
                 res << " " * (level+1)*3
-                res << "static unsigned long long data[] = { "
+                # res << "static unsigned long long data[] = { "
+                res << "static unsigned int data[] = { "
                 res << str.scan(/.{1,#{Low2C.int_width}}/m).map do |sub|
-                    sub.to_i(2).to_s + "ULL"
+                    sub.to_i(2).to_s # + "ULL"
                 end.join(",")
                 res << " };\n"
                 # Create the value.
@@ -1930,11 +1931,10 @@ module HDLRuby::Low
             res << "ref = #{self.ref.to_c(level+2)};\n"
             # Compute the index.
             res << (" " * ((level+1)*3))
-            # res << "idx = read64(#{self.index.to_c(level+2)});\n"
             res << "idx = value2integer(#{self.index.to_c(level+2)});\n"
             # Make the access.
             res << (" " * ((level+1)*3))
-            # res << "dst = read_range(ref,idx,idx,#{self.ref.type.base.to_c(level)},dst);\n"
+            # puts "self.type.width=#{self.type.width}"
             res << "dst = read_range(ref,idx,idx,#{self.type.to_c(level)},dst);\n"
             # Restore the state of the value pool.
             res << (" " * ((level+1)*3))
@@ -1947,7 +1947,9 @@ module HDLRuby::Low
         # Generates the C text for reference as left value to a signal.
         # +level+ is the hierarchical level of the object.
         def to_c_signal(level = 0)
+            # puts "to_c_signal for RefIndex"
             return "make_ref_rangeS(#{self.ref.to_c_signal(level)}," +
+                "#{self.type.to_c(level)}," + 
                 "value2integer(#{self.index.to_c(level)}),value2integer(#{self.index.to_c(level)}))"
         end
     end
@@ -1985,7 +1987,7 @@ module HDLRuby::Low
             # Make the access.
             res << (" " * ((level+1)*3))
             # res << "dst = #{command}_range(ref,first,last,#{self.ref.type.base.to_c(level)},dst);\n"
-            # puts "will read_range for #{self.ref.name} with width=#{self.ref.type.width} with base width=#{self.ref.type.base.width} with range=#{self.ref.type.range} with range=#{self.range.first.content}..#{self.range.last.content}"
+            # puts "#{command}_range with first=#{self.range.first} and last=#{self.range.last}"
             res << "dst = #{command}_range(ref,first,last,#{self.type.base.to_c(level)},dst);\n"
             # Restore the state of the value pool.
             res << (" " * ((level+1)*3))

data/lib/HDLRuby/sim/hruby_sim.h

@@ -101,6 +101,7 @@ typedef struct ValueS_ {
 /* The tructure of a reference to a range in a value. */
 typedef struct RefRangeS_ {
     SignalI signal;           /* The refered signal. */
+    Type type;                /* The tyep of the elements. */
     unsigned long long first; /* The first index in the range. */
     unsigned long long last;  /* The last index in the range. */
 } RefRangeS;
@@ -308,11 +309,12 @@ extern int same_content_value_range(Value value0, unsigned long long first,
 
 /** Creates a reference to a range inside a signal.
  *  @param signal the signal to refer
+ *  @param typ the type of the elements.
  *  @param first the start index of the range
  *  @param last the end index of the range
  *  @return the resulting reference */
-extern RefRangeS make_ref_rangeS(SignalI signal, unsigned long long first,
-        unsigned long long last);
+extern RefRangeS make_ref_rangeS(SignalI signal, Type typ, 
+        unsigned long long first, unsigned long long last);
 
 
 /* The interface for the lists. */

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -2171,7 +2171,8 @@ Value read_range_numeric(Value value, long long first, long long last,
     /* Compute the read mask. */
     // unsigned long long mask = ((-1LL) << first) & (~((-1LL) << (last+1)));
     /* NOTE: once again, << 64 does not work like expected. */
-    unsigned long long mask = mask+bw < 64 ? (~((-1LL) << (last+bw))) : -1LL;
+    unsigned long long mask = last+bw < 64 ? (~((-1LL) << (last+bw))) : -1LL;
+    // printf("mask=%llx\n",mask);
     /* Performs the read. */
     unsigned long long data = (value->data_int & mask) >> first;
     /* Write it to the destination. */
@@ -2216,7 +2217,9 @@ Value write_range_numeric(Value src, long long first, long long last,
     /* Copy from the source. */
     unsigned long long src_data = src->data_int & ~((-1LL) << (last-first+1));
     /* Cleans the destination where to place the data. */
-    unsigned long long mask = ~(((-1LL) << first) & ~((-1LL) << (last+1)));
+    unsigned long long mask;
+    if (last<63) mask = ~(((-1LL) << first) & ~((-1LL) << (last+1)));
+    else         mask = ~((-1LL)<<first);
     unsigned long long dst_data = dst->data_int & mask;
     // printf("src_data=%llx  mask=%llx dst_data=%llx\n",src_data,mask,dst_data);
     /* Write the data. */
@@ -2947,12 +2950,13 @@ int same_content_value_range(Value value0,
 
 /** Creates a reference to a range inside a signal.
  *  @param signal the signal to refer
+ *  @param typ the type of the elements
  *  @param first the start index of the range
  *  @param last the end index of the range
  *  @return the resulting reference */
-RefRangeS make_ref_rangeS(SignalI signal, unsigned long long first,
+RefRangeS make_ref_rangeS(SignalI signal, Type typ, unsigned long long first,
         unsigned long long last) {
-    RefRangeS result = { signal, first, last };
+    RefRangeS result = { signal, typ, first, last };
     return result;
 }
 

data/lib/HDLRuby/sim/hruby_sim_core.c

@@ -586,12 +586,14 @@ void transmit_to_signal_range_seq(Value value, RefRangeS ref) {
     SignalI signal = ref.signal;
     unsigned long long first = ref.first;
     unsigned long long last = ref.last;
-    // printf("Tansmit to signal range: %s(%p)\n",signal->name,signal);
+    // printf("Tansmit to signal range: %s(%p) [%llu,%llu]\n",signal->name,signal,first,last);
     /* Can transmit, copy the content. */
     if (signal->fading)
-        write_range(value,first,last,signal->f_value->type,signal->f_value);
+        // write_range(value,first,last,signal->f_value->type,signal->f_value);
+        write_range(value,first,last,ref.type,signal->f_value);
     else
-        write_range_no_z(value,first,last,signal->f_value->type,signal->f_value);
+        // write_range_no_z(value,first,last,signal->f_value->type,signal->f_value);
+        write_range_no_z(value,first,last,ref.type,signal->f_value);
     /* And touch the signal. */
     touch_signal_seq(signal);
 }

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.19"
+  VERSION = "2.6.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.19
+  version: 2.6.22
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,7 @@ files:
 - lib/HDLRuby/hdr_samples/with_memory_rom.rb
 - 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_to_array.rb
 - lib/HDLRuby/hdrcc.rb
 - lib/HDLRuby/high_samples/_adder_fault.rb