HDLRuby 2.6.8 → 2.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f27a3801dbe93fa55cba40a6a66b91f94df070e255689ac9d73f894b006bd0
-  data.tar.gz: 911aadbbb04317300946682df515527e72602d36aacb792bc2c3f80ea88fa14d
+  metadata.gz: 2d49fb40d2d1233c59c0ae1f6d7afea51ab17e70aaac5f605295f4c44e478fa4
+  data.tar.gz: 0b14393197c0af246dae6c221d2beb94580fa9b4c30b234e82efdae4eebf5bca
 SHA512:
-  metadata.gz: ea09062dfce477be1db11be382672323711d6fa996cb2f3716cd43692ba1063f9ccd651b6b870a09b319fbd8374b82635075a72b00b89a8e305385adf72c097b
-  data.tar.gz: 0ecc3b863e4e41ed3f25083dcf579b014a2a6d04dfb41cd71262d45d115b4efb23d8d869c714508ada05b0a239afd484143733a16343f9fd8738375bbf871dbe
+  metadata.gz: e2c55c6966faa1274aee2ae712b376aec22670e9a574b4d5312e73a8a8a1f85713b8312d6b923e4daef030398667c327245ee8aeb813c3d379d137dd63ec9af8
+  data.tar.gz: a28d25d1a5ff5893e64ede5229a4b53c7ad0c4ff6479807e3f76764c9f464fc5d0b6a41f8cce3ea8b49338895a3d95e8582760c64a0d8df21a5683fd0acba4d3

data/lib/HDLRuby/hdr_samples/neg_arith_bench.rb

@@ -2,6 +2,7 @@
 # A benchmark for testing the arithmetic with signed values.
 system :neg_arith_bench do
     signed[11..0].inner :x,:y,:z
+    inner :cmp
 
     timed do
         x <= 10
@@ -9,41 +10,51 @@ system :neg_arith_bench do
         z <= 0
         !10.ns
         z <= 10 * 10
+        cmp <= (10 < 10)
         !10.ns
         z <= x * y
+        cmp <= (x < y)
         !10.ns
         x <= 10
         y <= -10
         !10.ns
         z <= 10 * (-10)
+        cmp <= (10 < -10)
         !10.ns
         z <= x * y
+        cmp <= (x < y)
         !10.ns
         x <= -10
         y <= 10
         !10.ns
         z <= (-10) * 10
+        cmp <= (-10 < 10)
         !10.ns
         z <= x * y
+        cmp <= (x < y)
         !10.ns
         x <= -10
         y <= -10
         !10.ns
         z <= (-10) * (-10)
+        cmp <= (-10 < -10)
         !10.ns
         z <= x * y
+        cmp <= (x < y)
         !10.ns
         x <= _000000011010
         y <= _000011111010
         z <= 0
         !10.ns
         z <= x * y
+        cmp <= (x < y)
         !10.ns
         x <= _000000011010
         y <= _111111111010
         z <= 0
         !10.ns
         z <= x * y
+        cmp <= (x < y)
         !10.ns
     end
 end

data/lib/HDLRuby/hdrcc.rb

@@ -110,7 +110,7 @@ module HDLRuby
                     else
                         # A standard file is found, skip it since it does not
                         # need to be read.
-                        # puts "Standard files: #{founds}"
+                        # show? "Standard files: #{founds}"
                         return false
                     end
                 end
@@ -134,7 +134,7 @@ module HDLRuby
                     file = @top_file_name
                 end
             end
-            # puts "read_all with file=#{file}"
+            # show? "read_all with file=#{file}"
             # Read the file
             # read(file)
             unless read(file) then
@@ -158,7 +158,7 @@ module HDLRuby
 
         # Displays the syntax tree of all the files.
         def show_all(outfile = $stdout)
-            # puts "@checks.size=#{@checks.size}"
+            # show? "@checks.size=#{@checks.size}"
             @checks.each { |check| check.show(outfile) }
         end
 
@@ -166,7 +166,7 @@ module HDLRuby
         def get_top
             # Get all the systems.
             systems = @checks.reduce([]) {|ar,check| ar + check.get_all_systems}
-            # puts "First systems=#{systems}"
+            # show? "First systems=#{systems}"
             # Remove the systems that are instantiated or included
             # (they cannot be tops)
             @checks.each do |check|
@@ -183,7 +183,7 @@ module HDLRuby
                     systems -= check.get_inherit_systems(inherit)
                 end
             end
-            # puts "Now systems=#{systems}"
+            # show? "Now systems=#{systems}"
             # Return the first top of the list.
             return systems[-1]
         end
@@ -195,7 +195,7 @@ module HDLRuby
             if @top_system == "" then
                 # No, look for it.
                 @top_system = get_top
-                # puts "@top_system=#{@top_system}"
+                # show? "@top_system=#{@top_system}"
                 unless @top_system then
                     # Not found? Error.
                     # Maybe it is a parse error, look for it.
@@ -238,7 +238,7 @@ module HDLRuby
                 # Dump to a file.
                 if chunk.name != :sim then 
                     # The chunk is to be dumbed to a file.
-                    # puts "Outputing chunk:#{HDLRuby::Low::Low2C.obj_name(chunk)}"
+                    # show? "Outputing chunk:#{HDLRuby::Low::Low2C.obj_name(chunk)}"
                     outfile = File.open(path + "/" +
                                        HDLRuby::Low::Low2C.obj_name(chunk) + "." +
                                        chunk.name.to_s,"w")
@@ -351,6 +351,12 @@ $optparse = OptionParser.new do |opts|
     opts.on("-D", "--debug","Set the HDLRuby debug mode") do |d|
         $options[:debug] = d
     end
+    opts.on("--verbose","Set verbose mode.") do |d|
+        HDLRuby.verbosity = 2
+    end
+    opts.on("--volubile","Set extreme verbose mode.") do |d|
+        HDLRuby.verbosity = 3
+    end
     opts.on("-T","--test t0,t1,t2","Compile the unit tests named t0,t1,...") do |t|
         $options[:test] = t
     end
@@ -396,7 +402,7 @@ $optparse = OptionParser.new do |opts|
 end
 $optparse.parse!
 
-# puts "options=#{$options}"
+# show? "options=#{$options}"
 
 # Check the compatibility of the options
 if $options.count {|op| [:yaml,:hdr,:verilog,:vhdl].include?(op) } > 1 then
@@ -436,7 +442,7 @@ if ($options[:test] || $options[:testall]) then
     $test_file.write("require 'std/hruby_unit.rb'\nrequire_relative '#{$input}'\n\n" +
                      "HDLRuby::Unit.test(:\"#{$top}\"#{tests})\n")
     # $test_file.rewind
-    # puts $test_file.read
+    # show? $test_file.read
     # exit
     $test_file.rewind
     # It is the new input file.
@@ -491,24 +497,28 @@ end
 
 # Generate the result.
 # Get the top systemT.
+HDLRuby.show Time.now
 $top_system = $top_instance.to_low.systemT
-
-
-# Apply the pre drivers if any.
-Hdecorator.each_with_property(:pre_driver) do |obj, value|
-    unless value.is_a?(Array) && value.size == 2 then
-        raise "pre_driver requires a driver file name command name."
-    end
-    # Load the driver.
-    require_relative(value[0].to_s)
-    # Ensure obj is the low version.
-    if obj.properties.key?(:high2low) then
-        # obj is high, get the corresponding low.
-        obj = obj.properties[:high2low][0]
-    end
-    # Execute it.
-    send(value[1].to_sym,obj,*value[2..-1])
-end
+$top_intance = nil # Free as much memory as possible.
+HDLRuby.show "##### Top system built #####"
+HDLRuby.show Time.now
+
+
+# # Apply the pre drivers if any.
+# Hdecorator.each_with_property(:pre_driver) do |obj, value|
+#     unless value.is_a?(Array) && value.size == 2 then
+#         raise "pre_driver requires a driver file name command name."
+#     end
+#     # Load the driver.
+#     require_relative(value[0].to_s)
+#     # Ensure obj is the low version.
+#     if obj.properties.key?(:high2low) then
+#         # obj is high, get the corresponding low.
+#         obj = obj.properties[:high2low][0]
+#     end
+#     # Execute it.
+#     send(value[1].to_sym,obj,*value[2..-1])
+# end
 
 
 # Gather the non-HDLRuby code.
@@ -558,15 +568,23 @@ elsif $options[:clang] then
     # top_system = $top_system
     # Preprocess the HW description for valid C generation.
     $top_system.each_systemT_deep do |systemT|
+        HDLRuby.show "seq2seq step..."
         # Coverts the par blocks in seq blocks to seq blocks to match
         # the simulation engine.
         systemT.par_in_seq2seq!
+        HDLRuby.show Time.now
+        HDLRuby.show "connections_to_behaviors step..."
         # Converts the connections to behaviors.
         systemT.connections_to_behaviors!
+        HDLRuby.show Time.now
         # Break the RefConcat.
+        HDLRuby.show "concat_assigns step..."
         systemT.break_concat_assigns! 
+        HDLRuby.show Time.now
         # Explicits the types.
+        HDLRuby.show "explicit_types step..."
         systemT.explicit_types!
+        HDLRuby.show Time.now
     end
     # Generate the C.
     if $options[:multiple] then
@@ -637,7 +655,7 @@ elsif $options[:clang] then
             name = $output + "/" +
                 HDLRuby::Low::Low2C.c_name(systemT.name) +
                 ".c"
-            # puts "for systemT=#{systemT.name} generating: #{name}"
+            # show? "for systemT=#{systemT.name} generating: #{name}"
             # Open the file for current systemT
             outfile = File.open(name,"w")
             # Generate the C code in to.
@@ -691,14 +709,26 @@ 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 "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!
+        HDLRuby.show "par_in_seq2seq! step..."
         systemT.par_in_seq2seq!
+        HDLRuby.show Time.now
+        HDLRuby.show "initial_concat_to_timed! step..."
         systemT.initial_concat_to_timed!
+        HDLRuby.show Time.now
+        HDLRuby.show "with_port! step..."
         systemT.with_port!
+        HDLRuby.show Time.now
     end
     # # Verilog generation
     # $output << top_system.to_verilog
@@ -788,13 +818,13 @@ elsif $options[:vhdl] then
     end
 end
 
-# Apply the post drivers if any.
-Hdecorator.each_with_property(:post_driver) do |obj, value|
-    # Load the driver.
-    require_relative(value[0].to_s)
-    # Execute it.
-    send(value[1].to_sym,obj,$output)
-end
+# # Apply the post drivers if any.
+# Hdecorator.each_with_property(:post_driver) do |obj, value|
+#     # Load the driver.
+#     require_relative(value[0].to_s)
+#     # Execute it.
+#     send(value[1].to_sym,obj,$output)
+# end
 
 # Dump the properties
 if $options[:dump] then