HDLRuby 2.4.17 → 2.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d134168a557ce7853d38cce367de803708a06bfec18d84a963fe814da5f52cbd
-  data.tar.gz: d651e64c4ef724255f6b7096478a2b8d5c7192a1c8ce6fa5c45b15cca67ea9eb
+  metadata.gz: 84f01afb241f5e5e208e4fc47e12e9f1ae8e63e759181280500c2a591999c28d
+  data.tar.gz: 4ae5e9c2eecc25f26803da8c4b70e0bcfa57e7979759d9a194bb6effd515788d
 SHA512:
-  metadata.gz: 653881323cdae37fe30caf8bee4a131d68496982ff5f2a25db0a02383ccf50b01d02e8a4f1aa2f67c8840b66abfd3fe7905e2377fdc4d2965a823fb75013ab50
-  data.tar.gz: 3ff9f0ebf6edb2fe3ed9ba3e03426978121c23f69f83887bc2461b99e49f37189378a682a58a41a717c31d1ee36dcd9563a070ba221f8a9c340abc58942f58d1
+  metadata.gz: f721bbbbbddd9328444b446a882623428e638cdacc3d09c41a86b7c7e260e662e43df7747f91c7eeb3e498b335495722268869f151cff64aaf0d953385285d6b
+  data.tar.gz: 48e48595def6334b972eec991ae83a44876e30994101dd336a7036608c7da47799eafa7fdfb955e11d6f12f7b9728cafdea5fde1d933d6d3c165ef1ba1cdd375

data/lib/HDLRuby/hdr_samples/with_connector.rb

@@ -125,7 +125,9 @@ end
 # Module for testing the connector.
 system :with_connectors do
     inner :clk, :rst
-    [4].inner :counter #, :res_0,:res_1,:res_2,:res_3
+
+    # First tester.
+    [4].inner :counter
     [4*4].inner :res
     inner :ack_in, :ack_out
 
@@ -146,6 +148,22 @@ system :with_connectors do
     # Connect the middle queues to the output queue.
     merger([bit[4]]*4,clk.negedge,mid_qus,out_qu)
 
+
+    # Second tester.
+    [4].inner :counterb
+    [4].inner :resb
+    inner :ack_inb0, :ack_inb1, :ack_outb
+
+    # The input queues.
+    queue(bit[4],4,clk,rst).(:in_qub0)
+    queue(bit[4],4,clk,rst).(:in_qub1)
+
+    # The output queue.
+    queue(bit[4],4,clk,rst).(:out_qub)
+
+    # Connect then with a serializer.
+    serializer(bit[4],clk.negedge,[in_qub0,in_qub1],out_qub)
+
     # # Slow version, always work
     # par(clk.posedge) do
     #     ack_in <= 0
@@ -171,19 +189,32 @@ system :with_connectors do
     # Fast version but assumes connected channels are blocking
     par(clk.posedge) do
         ack_in <= 0
-        hif(rst) { counter <= 0 }
+        ack_inb0 <= 0
+        ack_inb1 <= 0
+        hif(rst) { counter <= 0; counterb <= 0 }
         helse do
             in_qu.write(counter)  do
                 ack_in <= 1
                 counter <= counter + 1
             end
             hif(ack_in) do
-                # mid_qu0.read(res_0)
-                # mid_qu1.read(res_1)
-                # mid_qu2.read(res_2)
-                # mid_qu3.read(res_3)
                 out_qu.read(res)
             end
+            hif(~ack_inb0) do
+                in_qub0.write(counterb) do
+                    ack_inb0 <= 1
+                    counterb <= counterb + 1
+                end
+            end
+            helse do
+                in_qub1.write(counterb) do
+                    ack_inb1 <= 1
+                    counterb <= counterb + 1
+                end
+            end
+            hif(ack_inb0 | ack_inb1) do
+                out_qub.read(resb)
+            end
         end
     end
 

data/lib/HDLRuby/std/connector.rb

@@ -37,7 +37,7 @@ module HDLRuby::High::Std
 
     # Function for generating a connector that merges the output of
     # channels +in_chs+ and connects the result to channel +out_ch+ with
-    # data of +typ+.
+    # data of types from +typs+.
     # The merge is done according to event +ev+.
     function :merger do |typs, ev, in_chs, out_ch|
         ev = ev.posedge unless ev.is_a?(Event)
@@ -63,5 +63,46 @@ module HDLRuby::High::Std
     end
 
 
+    # Function for generating a connector that serialize to the output of
+    # channels +in_chs+ and connects the result to channel +out_ch+ with
+    # data of +typ+.
+    # The merge is done according to event +ev+.
+    function :serializer do |typ, ev, in_chs, out_ch|
+        ev = ev.posedge unless ev.is_a?(Event)
+        size = in_chs.size
+        inner :out_ack
+        # in_reqs = size.times.map { |i| inner(:"in_req#{i}") }
+        in_acks = size.times.map { |i| inner(:"in_ack#{i}") }
+        datas =   size.times.map { |i| typ.inner(:"data#{i}") }
+        # The inpt channel selector
+        [size.width].inner :idx
+        inner :reading
+        par(ev) do
+            # in_reqs.each { |req| req <= 1 }
+            idx <= 0
+            reading <= 0
+            out_ack <= 0
+            # hif(idx == size) { in_reqs.each { |req| req <= 0 } }
+            # hif((idx == 0) & (in_reqs.reduce(_1) { |sum,req| req & sum })) do
+            hif(idx == 0) do
+                hif(~reading) do
+                    size.times { |i| in_acks[i] <= 0 }
+                end
+                reading <= 1
+                in_chs.each_with_index do |ch,i|
+                    ch.read(datas[i]) { in_acks[i] <= 1 }
+                end
+            end
+            hif(in_acks.reduce(_1) { |sum,req| req & sum }) do
+                hcase(idx)
+                datas.each_with_index do |data,i|
+                    hwhen(i) do
+                        out_ch.write(data) { idx <= idx + 1; out_ack <= 1 }
+                    end
+                end
+            end
+        end
+    end
+
 
 end 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.4.17"
+  VERSION = "2.4.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.17
+  version: 2.4.18
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler