HDLRuby 2.6.5 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928c0006bc7fee9ebff9356509ed09ad9109d310e64eea92a41f42d751d560b1
-  data.tar.gz: d63743942c8c73f79224c129ca8265995ddff3397a5628e185da497b0599a6e0
+  metadata.gz: 01f27a3801dbe93fa55cba40a6a66b91f94df070e255689ac9d73f894b006bd0
+  data.tar.gz: 911aadbbb04317300946682df515527e72602d36aacb792bc2c3f80ea88fa14d
 SHA512:
-  metadata.gz: b7508f64a04a6662c035ce362d9193d617b022dd21bbccaa28f8c70d2a38790919f6d995b545a5082df0be6e23654a4bacb158ea6dfaaa673ea592ccac4c67f9
-  data.tar.gz: 8e77890ec50610400f848340a4ad4a4eb0d9095aff8c674ecb695cdddf9aabbd7e585b2bf5bfc8b76553612f1e216bcc7e21f00888335f07b95f54c89b88efc2
+  metadata.gz: ea09062dfce477be1db11be382672323711d6fa996cb2f3716cd43692ba1063f9ccd651b6b870a09b319fbd8374b82635075a72b00b89a8e305385adf72c097b
+  data.tar.gz: 0ecc3b863e4e41ed3f25083dcf579b014a2a6d04dfb41cd71262d45d115b4efb23d8d869c714508ada05b0a239afd484143733a16343f9fd8738375bbf871dbe

data/lib/HDLRuby/hdr_samples/comparison_bench.rb

@@ -0,0 +1,40 @@
+# Test the comparison operators.
+
+# A benchmark for the adder.
+system :adder_bench do
+    [8].inner :x, :y
+    signed[8].inner :u,:v
+    inner :ue, :ult, :ule, :ugt, :uge
+    inner :se, :slt, :sle, :sgt, :sge
+
+    par do
+        ue  <= (x == y)
+        ult <= (x < y)
+        ule <= (x <= y)
+        ugt <= (x > y)
+        uge <= (x >= y)
+
+        se  <= (u == v)
+        slt <= (u < v)
+        sle <= (u <= v)
+        sgt <= (u > v)
+        sge <= (u >= v)
+    end
+
+    timed do
+        x <= 0
+        y <= 0
+        u <= 0
+        v <= 0
+        !10.ns
+        x <= 1
+        u <= 1
+        !10.ns
+        y <= 2
+        v <= 2
+        !10.ns
+        x <= 2
+        u <= -2
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/type_minmax_bench.rb

@@ -0,0 +1,37 @@
+# Test the type method min and max
+
+# A benchmark for the adder.
+system :adder_bench do
+    [32].inner :x
+    signed[32].inner :y
+
+    timed do
+        x <= 0
+        y <= 0
+        !10.ns
+        x <= bit[8].max
+        y <= signed[8].max
+        !10.ns
+        x <= bit[8].min
+        y <= signed[8].min
+        !10.ns
+        x <= bit[10].max
+        y <= signed[10].max
+        !10.ns
+        x <= bit[10].min
+        y <= signed[10].min
+        !10.ns
+        x <= bit[16].max
+        y <= signed[16].max
+        !10.ns
+        x <= bit[16].min
+        y <= signed[16].min
+        !10.ns
+        x <= bit[32].max
+        y <= signed[32].max
+        !10.ns
+        x <= bit[32].min
+        y <= signed[32].min
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/with_to_array.rb

@@ -0,0 +1,29 @@
+
+def connect8(i0,i1,i2,i3,i4,i5,i6,i7,
+             o0,o1,o2,o3,o4,o5,o6,o7)
+    o0 <= i0
+    o1 <= i1
+    o2 <= i2
+    o3 <= i3
+    o4 <= i4
+    o5 <= i5
+    o6 <= i6
+    o7 <= i7
+end
+
+# A benchmark for testing the conversion to ruby array of expressions.
+system :with_to_bench do
+    [8].inner :val
+    inner :b0,:b1,:b2,:b3,:b4,:b5,:b6,:b7
+
+    connect8(*val,b0,b1,b2,b3,b4,b5,b6,b7)
+
+    timed do
+        val <= _01101010
+        !10.ns
+        val <= _01011010
+        !10.ns
+        val <= _00001111
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdrcc.rb

@@ -637,6 +637,7 @@ elsif $options[:clang] then
             name = $output + "/" +
                 HDLRuby::Low::Low2C.c_name(systemT.name) +
                 ".c"
+            # puts "for systemT=#{systemT.name} generating: #{name}"
             # Open the file for current systemT
             outfile = File.open(name,"w")
             # Generate the C code in to.

data/lib/HDLRuby/hruby_high.rb

@@ -609,7 +609,8 @@ module HDLRuby::High
         # possible arguments +args+.
         def instantiate(i_name,*args)
             # Create the eigen type.
-            eigen = self.expand(High.names_create(i_name.to_s + ":T"), *args)
+            # eigen = self.expand(High.names_create(i_name.to_s + ":T"), *args)
+            eigen = self.expand(HDLRuby.uniq_name(i_name.to_s + ":T"), *args)
 
             # Create the instance and sets its eigen system to +eigen+.
             instance = @instance_class.new(i_name,eigen)
@@ -758,8 +759,10 @@ module HDLRuby::High
                       "Cannot convert a system without a name to HDLRuby::Low."
             end
             # Create the resulting low system type.
-            systemTL = HDLRuby::Low::SystemT.new(High.names_create(name),
+            # systemTL = HDLRuby::Low::SystemT.new(High.names_create(name),
+            systemTL = HDLRuby::Low::SystemT.new(HDLRuby.uniq_name(name),
                                                    self.scope.to_low)
+            # puts "New low from system #{self.name}: #{systemTL.name}"
             # For debugging: set the source high object 
             systemTL.properties[:low2high] = self.hdr_id
             self.properties[:high2low] = systemTL
@@ -2655,7 +2658,6 @@ module HDLRuby::High
             end
         end
 
-
         # Converts to a select operator using current expression as
         # condition for one of the +choices+.
         #
@@ -2671,6 +2673,7 @@ module HDLRuby::High
         end
 
 
+
         # Methods for conversion for HDLRuby::Low: type processing, flattening
         # and so on
 

data/lib/HDLRuby/hruby_low.rb

@@ -1276,6 +1276,18 @@ module HDLRuby::Low
             end
         end
 
+        # Gets the type max value if any.
+        # Default: not defined.
+        def max
+            raise AnyError, "No max value for type #{self}"
+        end
+
+        # Gets the type min value if any.
+        # Default: not defined.
+        def min
+            raise AnyError, "No min value for type #{self}"
+        end
+
         # Get the direction of the type, little or big endian.
         def direction
             # By default, little endian.
@@ -1617,6 +1629,25 @@ module HDLRuby::Low
             return @base.width * ((first-last).abs + 1)
         end
 
+        # Gets the type max value if any.
+        def max
+            if (self.signed?) then
+                return (2**(self.width-1))-1
+            else
+                return (2**(self.width))-1
+            end
+        end
+
+        # Gets the type min value if any.
+        # Default: not defined.
+        def min
+            if (self.signed?) then
+                return -(2**(self.width-1))
+            else
+                return 0
+            end
+        end
+
         # Get the direction of the type, little or big endian.
         def direction
             return @range.first < @range.last ? :big : :little

data/lib/HDLRuby/sim/hruby_sim.h

@@ -219,6 +219,13 @@ Value shift_right_value(Value src0, Value src1, Value dst);
  *  @return dst */
 extern Value equal_value(Value src0, Value src1, Value dst);
 
+/** Computes the greater comparision of two values.
+ *  @param src0 the first source value of the comparison
+ *  @param src1 the second source value of the comparison
+ *  @param dst the destination value
+ *  @return dst */
+extern Value greater_value(Value src0, Value src1, Value dst);
+
 /** Computes the lesser comparision of two values.
  *  @param src0 the first source value of the comparison
  *  @param src1 the second source value of the comparison
@@ -226,12 +233,19 @@ extern Value equal_value(Value src0, Value src1, Value dst);
  *  @return dst */
 extern Value lesser_value(Value src0, Value src1, Value dst);
 
-/** Computes the greater comparision of two values.
+/** Computes the greater or equal comparision of two values.
  *  @param src0 the first source value of the comparison
  *  @param src1 the second source value of the comparison
  *  @param dst the destination value
  *  @return dst */
-extern Value greater_value(Value src0, Value src1, Value dst);
+extern Value greater_equal_value(Value src0, Value src1, Value dst);
+
+/** Computes the lesser or equal comparision of two values.
+ *  @param src0 the first source value of the comparison
+ *  @param src1 the second source value of the comparison
+ *  @param dst the destination value
+ *  @return dst */
+extern Value lesser_equal_value(Value src0, Value src1, Value dst);
 
 /** Selects a value depending on a condition.
  *  @param cond   the condition to use for selecting a value

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -686,6 +686,21 @@ static Value mod_value_defined_bitstring(Value src0, Value src1, Value dst) {
 }
 
 
+/** Computes the greater comparision of two defined bitstring values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return dst */
+static Value greater_value_defined_bitstring(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
+
+    /* Perform the comparison. */
+    dst->data_int = (value2integer(src0) > value2integer(src1));
+    return dst;
+}
+
 /** Computes the lesser comparision of two defined bitstring values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
@@ -701,19 +716,33 @@ static Value lesser_value_defined_bitstring(Value src0, Value src1, Value dst) {
     return dst;
 }
 
+/** Computes the greater or equal comparision of two defined bitstring values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return dst */
+static Value greater_equal_value_defined_bitstring(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
 
-/** Computes the greater comparision of two defined bitstring values.
+    /* Perform the comparison. */
+    dst->data_int = (value2integer(src0) >= value2integer(src1));
+    return dst;
+}
+
+/** Computes the lesser or equal comparision of two defined bitstring values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
  *  @param dst the destination value
  *  @return dst */
-static Value greater_value_defined_bitstring(Value src0, Value src1, Value dst) {
+static Value lesser_equal_value_defined_bitstring(Value src0, Value src1, Value dst) {
     /* Sets state of the destination using the first source. */
     dst->type = src0->type;
     dst->numeric = 1;
 
     /* Perform the comparison. */
-    dst->data_int = (value2integer(src0) > value2integer(src1));
+    dst->data_int = (value2integer(src0) <= value2integer(src1));
     return dst;
 }
 
@@ -1762,13 +1791,29 @@ static Value equal_value_numeric(Value src0, Value src1, Value dst) {
     dst->type = src0->type;
     dst->numeric = 1;
 
-    /* Perform the !XOR. */
-    // dst->data_int = (src0->data_int == src1->data_int);
-    dst->data_int = ~(src0->data_int ^ src1->data_int);
+    // /* Perform the !XOR. */
+    // dst->data_int = ~(src0->data_int ^ src1->data_int);
+    /* Perform the comparison. */
+    dst->data_int = (src0->data_int == src1->data_int) ? 1 : 0;
     return dst;
 }
 
 
+/** Computes the greater comparision of two numeric values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return the destination value */
+static Value greater_value_numeric(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
+
+    /* Perform the greater. */
+    dst->data_int = (src0->data_int > src1->data_int);
+    return dst;
+}
+
 /** Computes the lesser comparision of two numeric values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
@@ -1784,18 +1829,33 @@ static Value lesser_value_numeric(Value src0, Value src1, Value dst) {
     return dst;
 }
 
-/** Computes the greater comparision of two numeric values.
+/** Computes the greater or equal comparision of two numeric values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
  *  @param dst the destination value
  *  @return the destination value */
-static Value greater_value_numeric(Value src0, Value src1, Value dst) {
+static Value greater_equal_value_numeric(Value src0, Value src1, Value dst) {
     /* Sets state of the destination using the first source. */
     dst->type = src0->type;
     dst->numeric = 1;
 
-    /* Perform the lesser. */
-    dst->data_int = (src0->data_int > src1->data_int);
+    /* Perform the greater or equal. */
+    dst->data_int = (src0->data_int >= src1->data_int);
+    return dst;
+}
+
+/** Computes the lesser or equal comparision of two numeric values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return the destination value */
+static Value lesser_equal_value_numeric(Value src0, Value src1, Value dst) {
+    /* Sets state of the destination using the first source. */
+    dst->type = src0->type;
+    dst->numeric = 1;
+
+    /* Perform the lesser or equal. */
+    dst->data_int = (src0->data_int <= src1->data_int);
     return dst;
 }
 
@@ -2434,6 +2494,34 @@ Value equal_value(Value src0, Value src1, Value dst) {
 }
 
 
+
+/** Computes the greater comparision of two general values.
+ *  @param src0 the first source value of the addition
+ *  @param src1 the second source value of the addition
+ *  @param dst the destination value
+ *  @return dst */
+Value greater_value(Value src0, Value src1, Value dst) {
+    /* 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
+     * computation. */
+    if (src0->numeric && src1->numeric) {
+        /* Both sources are numeric. */
+        return greater_value_numeric(src0,src1,dst);
+    } else if (is_defined_value(src0) && is_defined_value(src1)) {
+        /* Both sources can be converted to numeric values. */
+        return greater_value_defined_bitstring(src0,src1,dst);
+    } else {
+        /* Cannot compute (for now), simply undefines the destination. */
+        /* First ensure dst has the right shape. */
+        copy_value(src0,dst);
+        /* Then make it undefined. */
+        set_undefined_bitstring(dst);
+    }
+    return dst;
+}
+
+
 /** Computes the lesser comparision of two general values.
  *  @param src0 the first source value of the addition
  *  @param src1 the second source value of the addition
@@ -2461,22 +2549,48 @@ Value lesser_value(Value src0, Value src1, Value dst) {
 }
 
 
-/** Computes the greater comparision of two general values.
- *  @param src0 the first source value of the addition
- *  @param src1 the second source value of the addition
+/** Computes the greater or equal comparision of two values.
+ *  @param src0 the first source value of the comparison
+ *  @param src1 the second source value of the comparison
  *  @param dst the destination value
  *  @return dst */
-Value greater_value(Value src0, Value src1, Value dst) {
+Value greater_equal_value(Value src0, Value src1, Value dst) {
     /* 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
      * computation. */
     if (src0->numeric && src1->numeric) {
         /* Both sources are numeric. */
-        return greater_value_numeric(src0,src1,dst);
+        return greater_equal_value_numeric(src0,src1,dst);
     } else if (is_defined_value(src0) && is_defined_value(src1)) {
         /* Both sources can be converted to numeric values. */
-        return greater_value_defined_bitstring(src0,src1,dst);
+        return greater_equal_value_defined_bitstring(src0,src1,dst);
+    } else {
+        /* Cannot compute (for now), simply undefines the destination. */
+        /* First ensure dst has the right shape. */
+        copy_value(src0,dst);
+        /* Then make it undefined. */
+        set_undefined_bitstring(dst);
+    }
+    return dst;
+}
+
+/** Computes the lesser or equal comparision of two values.
+ *  @param src0 the first source value of the comparison
+ *  @param src1 the second source value of the comparison
+ *  @param dst the destination value
+ *  @return dst */
+Value lesser_equal_value(Value src0, Value src1, Value dst) {
+    /* 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
+     * computation. */
+    if (src0->numeric && src1->numeric) {
+        /* Both sources are numeric. */
+        return lesser_equal_value_numeric(src0,src1,dst);
+    } else if (is_defined_value(src0) && is_defined_value(src1)) {
+        /* Both sources can be converted to numeric values. */
+        return lesser_equal_value_defined_bitstring(src0,src1,dst);
     } else {
         /* Cannot compute (for now), simply undefines the destination. */
         /* First ensure dst has the right shape. */
@@ -2488,6 +2602,7 @@ Value greater_value(Value src0, Value src1, Value dst) {
 }
 
 
+
 /** Selects a value depending on a general condition.
  *  @param cond   the condition to use for selecting a value
  *  @param dst    the destination value (used only if new value is created).

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.5"
+  VERSION = "2.6.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.8
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/HDLRuby/hdr_samples/alu.rb
 - lib/HDLRuby/hdr_samples/bstr_bench.rb
 - lib/HDLRuby/hdr_samples/calculator.rb
+- lib/HDLRuby/hdr_samples/comparison_bench.rb
 - lib/HDLRuby/hdr_samples/constant_in_function.rb
 - lib/HDLRuby/hdr_samples/counter_bench.rb
 - lib/HDLRuby/hdr_samples/dff.rb
@@ -134,6 +135,7 @@ files:
 - lib/HDLRuby/hdr_samples/sw_encrypt_cpusim_bench.rb
 - lib/HDLRuby/hdr_samples/system_open.rb
 - lib/HDLRuby/hdr_samples/tuple.rb
+- lib/HDLRuby/hdr_samples/type_minmax_bench.rb
 - lib/HDLRuby/hdr_samples/with_channel.rb
 - lib/HDLRuby/hdr_samples/with_class.rb
 - lib/HDLRuby/hdr_samples/with_connector.rb
@@ -148,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_to_array.rb
 - lib/HDLRuby/hdrcc.rb
 - lib/HDLRuby/high_samples/_adder_fault.rb
 - lib/HDLRuby/high_samples/_generic_transmission2.rb