origen_sim 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dc77dd81416662c4ecff9e01c03a7ed7a01cc31d79087ec6c9340cd72e0dd7f
-  data.tar.gz: 223d8e87547338de2ddf5061c5789b2f09c576e4acb448d666d9f4305db6acbe
+  metadata.gz: 00ddb2d142b91e167ae6ad4edddeb93a25aa22ce9ae57d771158329416f0f5b6
+  data.tar.gz: 45d794e47570c784b8815ef8c7f8cd095ae93048c27bec8dd05cedec2614e514
 SHA512:
-  metadata.gz: f29952826fecf63d1e7c96f96ebee945a0d48685ac21771138ea7c4dca51f0c433e2ea1198c9ea76068fb28528fc3af1320131dca5fb4ef0db8527494f8a7c56
-  data.tar.gz: 00db5869a5ebb43ae9138011ac0c36a649547fb37a9fb86f1b32bdf96588815fb4a11f78c0535b8ab258117011d001dac6030044dff266c6aaf503e5c4be1d12
+  metadata.gz: 44c72049e0a7c9ec50e4862db21dba4b972731afdadf79643c4fe29a11647f14071263498aad30c39e1313aa62f48b8d530c173e8e19ed9fde6a2a23cd5e0231
+  data.tar.gz: 18a952cad38daaf3ad78c4d2854f9f848714b26990621ae6999b3e3c7ea213b3bfb606164ee61e1da2813410ea8ba4a5871487b334da1d61347ec26dfe4cb912

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenSim
   MAJOR = 0
   MINOR = 20
-  BUGFIX = 0
+  BUGFIX = 1
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_sim/simulation.rb

@@ -197,8 +197,14 @@ module OrigenSim
         # That's all status info done until the simulation process ends, start a thread
         # to wait for that in case it ends before the VPI starts
         Thread.new do
-          @status.gets.chomp  # This will block until something is received
-          abort_connection
+          begin
+            @status.gets.chomp  # This will block until something is received
+          rescue Exception => e
+            Origen.log.error "Exception occurred while processing the monitor's status!"
+            raise e
+          ensure
+            abort_connection
+          end
         end
         Origen.log.debug 'Waiting for Origen VPI to start...'
 
@@ -252,6 +258,7 @@ module OrigenSim
       File.unlink(socket_id(:stderr)) if File.exist?(socket_id(:stderr))
       File.unlink(socket_id(:stdout)) if File.exist?(socket_id(:stdout))
       File.unlink(socket_id(:status)) if File.exist?(socket_id(:status))
+      @opened = false
     end
 
     # Returns true if the simulation is running

data/lib/origen_sim/simulator.rb

@@ -14,6 +14,15 @@ module OrigenSim
     LOG_CODES = { debug: 0, info: 1, warn: 2, warning: 2, success: 3, error: 4, deprecate: 5, deprecated: 5 }
     LOG_CODES_ = { 0 => :debug, 1 => :info, 2 => :warn, 3 => :success, 4 => :error, 5 => :deprecated }
 
+    # Sending logs over VPI has a maximum size, some of which are collateral, leaving
+    # the difference for the actual message.
+    LOGGER_COLLATERAL_SIZE = 11
+    MULTIPART_LOGGER_TOKEN = '!k+!'
+
+    # These config attributes are accepted by OrigenSim, but cannot be
+    # 'Marshal-ed'.
+    NON_DATA_CONFIG_ATTRIBUTES = [:post_process_run_cmd]
+
     TIMESCALES = { -15 => '1fs',
                    -14 => '10fs',
                    -13 => '100fs',
@@ -144,7 +153,11 @@ module OrigenSim
         fail "Unknown vendor #{options[:vendor]}, valid values are: #{VENDORS.map { |v| ':' + v.to_s }.join(', ')}"
       end
       @configuration = {
-        snapshot_details_options: {}
+        snapshot_details_options: {},
+
+        # The maximum message size the VPI can accept.
+        # Have this as a configuration parameter since this is VPI-implementation specific.
+        max_log_size:             1024
       }.merge(options)
       @tmp_dir = nil
 
@@ -316,7 +329,8 @@ module OrigenSim
                                    check_for_changes: false,
                                    quiet:             true,
                                    options:           { dir: wave_dir, wave_file: wave_file_basename, force: config[:force], setup: config[:setup], depth: :all },
-                                   output_file_name:  "#{wave_file_basename}.tcl"
+                                   output_file_name:  "#{wave_file_basename}.tcl",
+                                   preserve_target:   true
         end
         input_file_fast = "#{tmp_dir}/#{wave_file_basename}_fast.tcl"
         if !File.exist?(input_file_fast) || config_changed?
@@ -327,7 +341,8 @@ module OrigenSim
                                    check_for_changes: false,
                                    quiet:             true,
                                    options:           { dir: wave_dir, wave_file: wave_file_basename, force: config[:force], setup: config[:setup], depth: fast_probe_depth },
-                                   output_file_name:  "#{wave_file_basename}_fast.tcl"
+                                   output_file_name:  "#{wave_file_basename}_fast.tcl",
+                                   preserve_target:   true
         end
         save_config_signature
         wave_dir  # Ensure this exists since it won't be referenced above if the input file is already generated
@@ -621,7 +636,21 @@ module OrigenSim
           if options[:from_origen_sim]
             original.call(msg, type, options)
           else
-            log(msg, type)
+            # If the message would fit without the multi-line collateral, send it as normal.
+            # Note: this also avoids the pitfall of a message whose size is exactly
+            #   config[:max_log_size] - LOGGER_COLLATERAL_SIZE getting stuck until
+            #   something else is pushed.
+            if msg.size > config[:max_log_size] - (LOGGER_COLLATERAL_SIZE - MULTIPART_LOGGER_TOKEN.size)
+              msg.chars.each_slice(config[:max_log_size] - LOGGER_COLLATERAL_SIZE) do |m|
+                if m.size == config[:max_log_size] - LOGGER_COLLATERAL_SIZE
+                  log(m.join + MULTIPART_LOGGER_TOKEN, type, multipart: true)
+                else
+                  log(m.join, type, multipart: false)
+                end
+              end
+            else
+              log(msg, type, multipart: false)
+            end
           end
         end
       end
@@ -745,7 +774,7 @@ module OrigenSim
     # the simulator. This ensures that the given log messages will be in sync with output from the
     # simulator rather than potentially being ahead of the simulator if Origen were to output them
     # immediately.
-    def log(msg, type = :info)
+    def log(msg, type = :info, multipart: false)
       if dut_version > '0.15.0'
         put("k^#{LOG_CODES[type]}^#{msg}")
       else
@@ -1050,13 +1079,13 @@ module OrigenSim
 
     # Returns true if the config has been changed since the last time we called save_config_signature
     def config_changed?
-      Origen.app.session.origen_sim["#{id}_config"] != config
+      Origen.app.session.origen_sim["#{id}_config"] != config.except(*NON_DATA_CONFIG_ATTRIBUTES)
     end
 
     # Locally saves a signature for the current config, this will cause config_changed? to return false
     # until its contents change
     def save_config_signature
-      Origen.app.session.origen_sim["#{id}_config"] = config
+      Origen.app.session.origen_sim["#{id}_config"] = config.except(*NON_DATA_CONFIG_ATTRIBUTES)
     end
 
     # Returns the version of Origen Sim that the current DUT object was compiled with
@@ -1167,6 +1196,14 @@ module OrigenSim
       get.strip.to_i
     end
 
+    def running?
+      if simulation
+        simulation.running?
+      else
+        false
+      end
+    end
+
     # Returns true if the snapshot has been compiled with WREAL support
     def wreal?
       return @wreal if defined?(@wreal)

data/lib/origen_sim/stdout_reader.rb

@@ -10,8 +10,33 @@ module OrigenSim
       @last_message_at = Time.now
       super do
         begin
+          line = ''
           while @continue
-            line = @socket.gets
+            loop do
+              out = @socket.gets
+              if out.nil?
+                line += ''
+                break
+              end
+
+              unless line.empty?
+                # If there's already stuff in the current line,
+                # remove the VPI cruft and leave just the remainder of the message.
+                out = out.split(' ', 2)[-1]
+              end
+
+              if out.chomp.end_with?(OrigenSim::Simulator::MULTIPART_LOGGER_TOKEN)
+                # Part of a multipart message. Add this to the current line
+                # and grab the next piece.
+                line += out.chomp.gsub(OrigenSim::Simulator::MULTIPART_LOGGER_TOKEN, '')
+              else
+                # Either a single message or a the end of a multi-part message.
+                # Add this to the line break to print the output to the console.
+                line += out
+                break
+              end
+            end
+
             if line
               line = line.chomp
               # If line has been sent from Origen for logging
@@ -46,6 +71,7 @@ module OrigenSim
                   end
                 end
               end
+              line = ''
               @last_message_at = Time.now
             end
           end

data/lib/origen_sim.rb

@@ -54,7 +54,14 @@ module OrigenSim
     'disable'        => -1,
     'disabled'       => -1,
     'no_action'      => -1,
-    'no-action'      => -1
+    'no-action'      => -1,
+
+    # Disconnet/No-Connect Options
+    '-2'             => -2,
+    'no-connect'     => -2,
+    'no_connect'     => -2,
+    'disconnect'     => -2,
+    'disconnected'   => -2
   }
 
   def self.__instantiate_simulator__

data/pattern/test.rb

@@ -360,4 +360,8 @@ Pattern.create do
   if (tester.cycle_count - e) < 1400
     OrigenSim.error "sim_delay padding was not applied!"
   end
+  
+  Origen.log.info("Testing that OrigenSim can send exceedingly long messages through the simulator...")
+  Origen.log.debug('OrigenSim'*1024)
+  Origen.log.success("If you see this, it worked!")
 end

data/templates/rtl_v/origen.v.erb

@@ -156,14 +156,16 @@ module pin_drivers(<%= dut.rtl_pins.map { |n, p, o| "#{p.id}_o" }.join(', ') %>)
   reg sync = 0;
 
 % dut.rtl_pins.each do |name, pin, options|
-%   if pin.type == :analog
+%   unless pin.meta[:origen_sim_init_pin_state] == -2
+%     if pin.type == :analog
 `ifdef ORIGEN_WREAL 
   ana_pin_driver <%= pin.id %>(.pin(<%= pin.id %>_o));
 `else
   pin_driver #(<%= pin.meta[:origen_sim_init_pin_state].nil? ? '' : ".init_drive(#{pin.meta[:origen_sim_init_pin_state]}), "%>.pin_name("<%= pin.id %>")) <%= pin.id %>(.pin(<%= pin.id %>_o), .sync(sync));
 `endif
-%   else
+%     else
   pin_driver #(<%= pin.meta[:origen_sim_init_pin_state].nil? ? '' : ".init_drive(#{pin.meta[:origen_sim_init_pin_state]}), "%>.pin_name("<%= pin.id %>")) <%= pin.id %>(.pin(<%= pin.id %>_o), .sync(sync));
+%     end
 %   end
 % end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_sim
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen