HDLRuby 2.6.24 → 2.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935f56ddd3e2db8f8cd72ae2d8156af2dbf9c1961be139a1b2c4f27b2e0d483c
-  data.tar.gz: 5a6d8a611f8cf6e0e9ae859721a26b2940c569436479f74f01cced46b741d810
+  metadata.gz: a207f3222cab832d2b846f9658ea0cf9426e77afd14196c2db8cb6832bd4ebda
+  data.tar.gz: 490c8a6400d6faac77cec5ab1e49caa3abd94d4d0961521ec14d485cad640b72
 SHA512:
-  metadata.gz: c2df833c800000df44afdd2178414f6a282b4f597ec6d6b000a26e15ddff990f3ad0784e8d93d1dc75c4948f638824ea12a731340e896c8eb976ad83a61ff6eb
-  data.tar.gz: 84b29e842be879ed848aeb475f80cc34654a31d0ca0fbfa45093082374dca6a90ad8dce3b1774ae339d1c962fcf63a81e5821bddd924ea6be84f2a6f8b566e84
+  metadata.gz: '08196d385fb34444cc7387f6b4982063c38e98e10e51e3b58551b0a6b62dac6921fcbb9c7a89aaccabea055ecab0d2da0543667f688d52bd7ea6b875d9db5ebd'
+  data.tar.gz: c22296c840a2a7a52b8f4bd8bc34dc38c53f571feba0a01f1bb17a2f548c2965947916fcf47b95b33f2293f1481d8b91653d855c21708a746245cebffebc72f4

data/lib/HDLRuby/hdr_samples/case_bench.rb

@@ -0,0 +1,30 @@
+# Test the comparison operators.
+
+# A benchmark for the case statement.
+system :if_bench do
+    [8].inner :x, :y
+
+    par do
+        hcase(x)
+        hwhen(0) { y <= _10000000 }
+        hwhen(1) { y <= _10000001 }
+        hwhen(2) { y <= _10000010 }
+        hwhen(3) { y <= _10000011 }
+        helse    { y <= _00000000 }
+    end
+
+    timed do
+        x <= 0
+        !10.ns
+        x <= 1
+        !10.ns
+        x <= 2
+        !10.ns
+        x <= 3
+        !10.ns
+        x <= 4
+        !10.ns
+        x <= 5
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/constant_in_function.rb

@@ -2,7 +2,7 @@
 
 
 function :func do |addr|
-    bit[4][-4].constant tbl: [ _0000, _0001, _0010, _0011 ]
+    bit[4][-4].constant tbl: [ _1000, _1001, _1010, _1011 ]
     
     tbl[addr]
 end

data/lib/HDLRuby/hdr_samples/if_bench.rb

@@ -0,0 +1,24 @@
+# Test the comparison operators.
+
+# A benchmark for the if statement.
+system :if_bench do
+    [8].inner :x, :y, :z
+
+    par do
+        hif(x == y)   { z <= 1 }
+        helsif(x < y) { z <= 2 }
+        helse         { z <= 3 }
+    end
+
+    timed do
+        x <= 0
+        y <= 0
+        !10.ns
+        x <= 1
+        !10.ns
+        y <= 2
+        !10.ns
+        x <= 2
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/index_bench.rb

@@ -0,0 +1,37 @@
+# Test the comparison operators.
+
+# A benchmark for the index access..
+system :if_bench do
+    [8].inner :x
+    inner :b0,:b1,:b2,:b3,:b4,:b5,:b6,:b7
+
+    par do
+        b0 <= x[0]
+        b1 <= x[1]
+        b2 <= x[2]
+        b3 <= x[3]
+        b4 <= x[4]
+        b5 <= x[5]
+        b6 <= x[6]
+        b7 <= x[7]
+    end
+
+    timed do
+        x <= 0
+        !10.ns
+        x <= 1
+        !10.ns
+        x <= 2
+        !10.ns
+        x <= 3
+        !10.ns
+        x <= 4
+        !10.ns
+        x <= 5
+        !10.ns
+        x[7] <= 1
+        !10.ns
+        x[6] <= 1
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/range_bench.rb

@@ -0,0 +1,47 @@
+# Test the comparison operators.
+
+# A benchmark for the index access..
+system :if_bench do
+    [8].inner :x
+    [2].inner :r0,:r1,:r2,:r3
+
+    par do
+        r0 <= x[1..0]
+        r1 <= x[3..2]
+        r2 <= x[5..4]
+        r3 <= x[7..6]
+    end
+
+    timed do
+        x <= 0
+        !10.ns
+        x <= 1
+        !10.ns
+        x <= 2
+        !10.ns
+        x <= 3
+        !10.ns
+        x <= 4
+        !10.ns
+        x <= 5
+        !10.ns
+        x <= 6
+        !10.ns
+        x <= 7
+        !10.ns
+        x <= 8
+        !10.ns
+        x <= 81
+        !10.ns
+        x <= 123
+        !10.ns
+        x <= 0
+        !10.ns
+        x[7..6] <= 3
+        !10.ns
+        x[5..4] <= 2
+        !10.ns
+        x[3..2] <= 1
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/with_casts.rb

@@ -0,0 +1,30 @@
+
+# A benchmark for testing the casts.
+system :with_cast do
+    [8].inner :count
+    [8].inner :val0,:val1
+    [9].inner :val2,:val3
+
+    timed do
+        val0 <= _11111111
+        val1 <= _00000010
+        val3 <= _000000000
+        count <= 0
+        !10.ns
+        count <= 1
+        val2 <= val0 + val1
+        val3 <= val3 + 1
+        !10.ns
+        count <= 2
+        val2 <= val0.as(bit[9]) + val1
+        val3 <= val3.as(bit[10]) + 1
+        !10.ns
+        count <= 3
+        val2 <= (val0 + val1).as(bit[9])
+        val3 <= (val3 + 1).as(bit[10])
+        !10.ns
+        count <= 4
+        val2 <= (val0 + val1).as(bit[8])
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdr_samples/with_concat.rb

@@ -0,0 +1,26 @@
+
+# A benchmark for testing the concat.
+system :with_concat do
+    [8].inner :count
+    [4].inner :val0,:val1
+    [8].inner :val2
+    [12].inner :val3
+
+    val2 <= [val0,val1]
+    val3 <= [val2,val0]
+
+    timed do
+        val0 <= _1111
+        val1 <= _0000
+        count <= 0
+        !10.ns
+        val0 <= _1001
+        val1 <= _0110
+        count <= 1
+        !10.ns
+        val0 <= _1010
+        val1 <= _0101
+        count <= 2
+        !10.ns
+    end
+end

data/lib/HDLRuby/hdrcc.rb

@@ -486,6 +486,8 @@ if $options[:syntax] then
     $output << $loader.show_all
     exit
 end
+HDLRuby.show Time.now
+HDLRuby.show "##### Starting parser #####"
 
 if $options[:debug] then
     # Debug mode, no error management.
@@ -608,26 +610,29 @@ elsif $options[:clang] then
         $outfile = File.open($hname,"w")
         # Adds the generated globals
         $top_system.each_systemT_deep do |systemT|
-            # For the h file.
-            # hname = $output + "/" +
-            #     HDLRuby::Low::Low2C.c_name(systemT.name) +
-            #     ".h"
-            # hnames << File.basename(hname)
-            # # Open the file for current systemT
-            # output = File.open(hname,"w")
+            # # For the h file.
+            # # hname = $output + "/" +
+            # #     HDLRuby::Low::Low2C.c_name(systemT.name) +
+            # #     ".h"
+            # # hnames << File.basename(hname)
+            # # # Open the file for current systemT
+            # # output = File.open(hname,"w")
             # Generate the H code in to.
-            $outfile << systemT.to_ch
-            # # Close the file.
-            # output.close
-            # # Clears the name.
-            # hname = nil
+            # $outfile << systemT.to_ch
+            systemT.to_ch($outfile)
+            # # # Close the file.
+            # # output.close
+            # # # Clears the name.
+            # # hname = nil
         end
         # Adds the globals from the non-HDLRuby code
         $non_hdlruby.each do |code|
             code.each_chunk do |chunk|
                 if chunk.name == :sim then
-                    $outfile << "extern " + 
-                        HDLRuby::Low::Low2C.prototype(chunk.to_c)
+                    # $outfile << "extern " + 
+                    #     HDLRuby::Low::Low2C.prototype(chunk.to_c)
+                    $outfile << "extern "
+                    $outfile << HDLRuby::Low::Low2C.prototype(chunk.to_c(""))
                 end
             end
         end
@@ -659,7 +664,8 @@ elsif $options[:clang] then
             # Open the file for current systemT
             outfile = File.open(name,"w")
             # Generate the C code in to.
-            outfile << systemT.to_c(0,*$hnames)
+            # outfile << systemT.to_c(0,*$hnames)
+            systemT.to_c(outfile,0,*$hnames)
             # Close the file.
             outfile.close
             # Clears the name.
@@ -668,8 +674,10 @@ elsif $options[:clang] then
     else
         # Single file generation mode.
         $top_system.each_systemT_deep.reverse_each do |systemT|
-            $output << systemT.to_ch
-            $output << systemT.to_c
+            # $output << systemT.to_ch
+            systemT.to_ch($output)
+            # $output << systemT.to_c
+            systemT.to_c($output)
         end
         # Adds the main code.
         $output << HDLRuby::Low::Low2C.main(top_system,
@@ -709,17 +717,19 @@ elsif $options[:verilog] then
     # top_system = $top_system
     # Make description compatible with verilog generation.
     $top_system.each_systemT_deep do |systemT|
-        HDLRuby.show "casts_without_expression! step..."
-        systemT.casts_without_expression!
-        HDLRuby.show Time.now
+        # HDLRuby.show "casts_without_expression! step..."
+        # systemT.casts_without_expression!
+        # HDLRuby.show Time.now
         HDLRuby.show "to_upper_space! step..."
         systemT.to_upper_space!
         HDLRuby.show Time.now
-        HDLRuby.show "to_global_space! step..."
-        systemT.to_global_systemTs!
-        HDLRuby.show Time.now
-        # systemT.break_types!
-        # systemT.expand_types!
+    end
+    HDLRuby.show "to_global_space! step (global)..."
+    $top_system.to_global_systemTs!
+    HDLRuby.show Time.now
+    $top_system.each_systemT_deep do |systemT|
+        ## systemT.break_types!
+        ## systemT.expand_types!
         HDLRuby.show "par_in_seq2seq! step..."
         systemT.par_in_seq2seq!
         HDLRuby.show Time.now
@@ -818,6 +828,9 @@ elsif $options[:vhdl] then
     end
 end
 
+HDLRuby.show "##### Code generated #####"
+HDLRuby.show Time.now
+
 # # Apply the post drivers if any.
 # Hdecorator.each_with_property(:post_driver) do |obj, value|
 #     # Load the driver.

data/lib/HDLRuby/hruby_high.rb

@@ -1960,6 +1960,9 @@ module HDLRuby::High
                                                          &ruby_block)
                     # ruby_block.call(*args)
                 end
+                # sub do
+                #     ruby_block.call(*args,*other_block)
+                # end
             end
         else
             define_method(name.to_sym) do |*args,&other_block|
@@ -1968,6 +1971,9 @@ module HDLRuby::High
                     HDLRuby::High.top_user.instance_exec(*args,*other_block,
                                                          &ruby_block)
                 end
+                # sub do
+                #     ruby_block.call(*args,*other_block)
+                # end
             end
         end
     end

data/lib/HDLRuby/hruby_low.rb

@@ -63,6 +63,17 @@ module HDLRuby::Low
             cur = cur.parent until cur.is_a?(Scope)
             return cur
         end
+
+        # Get the full parents hierachy.
+        def hierarchy
+            res = []
+            cur = self
+            while(cur) do
+                res << cur
+                cur = cur.parent
+            end
+            return res
+        end
     end