origen_sim 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07feeaf38e2cacb8a570887c9bfc2acd38b26956
-  data.tar.gz: 693b70230e195a5b0fd49c586ec16f5116fe7d0d
+  metadata.gz: f670da6bba360fa76ac30b10cd097cde48d6353a
+  data.tar.gz: 07a1c407163212fd4fd04b45336ff399751155e2
 SHA512:
-  metadata.gz: 295d5c1df56f7341fa5e60b35b902169d92d21c482a2bee4452827d84e847697975e218aa4eb86e07d10d79e0939bee3d4e2a58ede7a347c8599fb26733ac7b9
-  data.tar.gz: e51c858045564989fa53ce7bc281d70afc887e5312f81908e44463a303c93d0c65d5a61cb15095a12892e7d3ff4dc3002bb5565f0735a3c37284298889500f7e
+  metadata.gz: 0f0bcd9d653bf6ba02617116e3d843c9e1f39c20f023544b9cf5bbf152289fd9fa5654be8d72b2bcd77928f0a26041ed4da9370110b1281b98e1e7568df73aa5
+  data.tar.gz: 1bd7de244589567b366d0213279df4f295f0ed374311bfc1b22d0666eacfd6855c19ecaa7fe4f7c6214452d54fb0ab4076b69f3714fae397dc9d25142ebfa580

data/config/shared_commands.rb

@@ -16,10 +16,28 @@ when "sim:co", "origen_sim:co"
   require "#{Origen.root!}/lib/origen_sim/commands/co"
   exit 0
 
+when "sim:pack"
+  require "#{Origen.root!}/lib/origen_sim/commands/pack"
+  OrigenSim::Commands::Pack.pack
+  exit 0
+
+when "sim:unpack"
+  require "#{Origen.root!}/lib/origen_sim/commands/pack"
+  OrigenSim::Commands::Pack.unpack
+  exit 0
+
+#when "sim:list"
+#  require "#{Origen.root!}/lib/origen_sim/commands/pack"
+#  OrigenSim::Commands::Pack.list
+#  exit 0
+
 else
   @plugin_commands << <<-EOT
  sim:ci       Checkin a simulation snapshot
  sim:co       Checkout a simulation snapshot
+ sim:pack     Packs the snapshot into a compressed directory
+ sim:unpack   Unpacks a snapshot
+ sim:list     List the available snapshot packs
   EOT
 
 end

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenSim
   MAJOR = 0
-  MINOR = 8
+  MINOR = 9
   BUGFIX = 0
   DEV = nil
 

data/ext/bridge.c

@@ -83,7 +83,7 @@ static void bridge_define_pin(char * name, char * pin_ix, char * drive_wave_ix,
   (*pin).capture_en = false;
 
   char * driver = (char *) malloc(strlen(name) + 16);
-  strcpy(driver, "origen.pins.");
+  strcpy(driver, ORIGEN_SIM_TESTBENCH_CAT("pins."));
   strcat(driver, name);
 
   char * data = (char *) malloc(strlen(driver) + 16);
@@ -661,7 +661,7 @@ PLI_INT32 bridge_wait_for_msg(p_cb_data data) {
       // Set Pattern Name
       //   a^atd_ramp_25mhz
       case 'a' :
-        handle = vpi_handle_by_name("origen.debug.pattern", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.pattern"), NULL);
         arg1 = strtok(NULL, "^");
 
         v.format = vpiStringVal;
@@ -686,7 +686,7 @@ PLI_INT32 bridge_wait_for_msg(p_cb_data data) {
       // Set Comment
       //   c^Some comment about the pattern
       case 'c' :
-        handle = vpi_handle_by_name("origen.debug.comments", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.comments"), NULL);
         arg1 = strtok(NULL, "^");
 
         v.format = vpiStringVal;
@@ -710,14 +710,14 @@ PLI_INT32 bridge_wait_for_msg(p_cb_data data) {
         break;
       // Sync enable
       case 'f' :
-        handle = vpi_handle_by_name("origen.pins.sync", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
         v.format = vpiDecStrVal;
         v.value.str = "1";
         vpi_put_value(handle, &v, NULL, vpiNoDelay);
         break;
       // Sync disable
       case 'g' :
-        handle = vpi_handle_by_name("origen.pins.sync", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
         v.format = vpiDecStrVal;
         v.value.str = "0";
         vpi_put_value(handle, &v, NULL, vpiNoDelay);
@@ -751,7 +751,7 @@ static void end_simulation() {
   s_vpi_value v;
 
   // Setting this node will cause the testbench to call $finish
-  handle = vpi_handle_by_name("origen.finish", NULL);
+  handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("finish"), NULL);
   v.format = vpiDecStrVal;
   v.value.str = "1";
   vpi_put_value(handle, &v, NULL, vpiNoDelay);

data/ext/common.h

@@ -11,6 +11,10 @@
 
 #define ENABLE_DEBUG
 
+/// Prepends the testbench name to the signal.
+/// e.g.: TESTBENCH_CAT(pins) => TESTBENCH_NAME.pins => origen.pins
+#define ORIGEN_SIM_TESTBENCH_CAT(signal) ORIGEN_SIM_TESTBENCH_NAME "." signal
+
 #ifdef ENABLE_DEBUG
 /* #define DEBUG(fmt, args...) fprintf(stderr, "DEBUG: %s:%d:%s(): " fmt, \
     __FILE__, __LINE__, __func__, ##args) */

data/ext/defines.h.erb

@@ -2,5 +2,6 @@
 #define DEFINES_H
 
 #define ORIGEN_SIM_VERSION "<%= OrigenSim::VERSION %>"
+#define ORIGEN_SIM_TESTBENCH_NAME "<%= options[:testbench_name] %>"
 
 #endif

data/ext/origen.c

@@ -85,6 +85,14 @@ PLI_INT32 origen_shutdown(p_cb_data data) {
   return 0;
 }
 
+/// Function to call the init PLI's init function
+/// Some toolchains will call this automatically, some will not
+/// Available here for those which do not automatically call init() for each PLI 
+PLI_INT32 bootstrap(p_cb_data data) {
+  vpi_printf("Origen Bootstrap Called!\n");
+  init();
+  return 0;
+}
 
 ///
 /// Registers a very basic VPI callback with reason and handler.

data/lib/origen_sim/commands/build.rb

@@ -3,7 +3,7 @@ require 'origen_sim'
 require_relative '../../../config/version'
 require 'origen_verilog'
 
-options = { source_dirs: [] }
+options = { source_dirs: [], testbench_name: 'origen' }
 
 # App options are options that the application can supply to extend this command
 app_options = @application_options || []
@@ -18,6 +18,7 @@ Usage: origen sim:build TOP_LEVEL_VERILOG_FILE [options]
   EOT
   opts.on('-o', '--output DIR', String, 'Override the default output directory') { |t| options[:output] = t }
   opts.on('-t', '--top NAME', String, 'Specify the top-level Verilog module name if OrigenSim can\'t work it out') { |t| options[:top_level_name] = t }
+  opts.on('--testbench NAME', String, 'Specify the testbench name if different from \'origen\'') { |t| options[:testbench_name] = t }
   opts.on('-s', '--source_dir PATH', 'Directories to look for include files in (the directory containing the top-level is already considered)') do |path|
     options[:source_dirs] << path
   end
@@ -86,7 +87,8 @@ Origen.app.runner.launch action:            :compile,
                          files:             "#{Origen.root!}/ext",
                          output:            output_directory,
                          check_for_changes: false,
-                         quiet:             true
+                         quiet:             true,
+                         options:           options
 
 dut.export(rtl_top_module, dir: "#{output_directory}", namespace: nil)
 

data/lib/origen_sim/commands/pack.rb

@@ -0,0 +1,37 @@
+module OrigenSim
+  module Commands
+    module Pack
+      # Note, making this a module instead of straight code so it can be called
+      # programatically to auto-unpack a snapshot.
+
+      def self.pack(options = {})
+        testbench = "#{Origen.app.root}/simulation"
+        unless Dir.exist?(testbench)
+          fail "Could not find path #{testbench}/#{ARGV[0]}"
+        end
+
+        FileUtils.mkdir("#{Origen.app.root}/simulation/static") unless Dir.exist?("#{Origen.app.root}/simulation/static")
+
+        output = "#{Origen.app.root}/simulation/static/#{ARGV[0]}.tar.gz"
+        puts "Packing #{testbench} into #{output}..."
+        system "tar vczf #{output} -C #{testbench} #{Origen.target.name}"
+      end
+
+      def self.unpack(options = {})
+        testbench = "#{Origen.app.root}/simulation/static/#{ARGV[0]}.tar.gz"
+        unless File.exist?(testbench)
+          fail "Could not find #{testbench}"
+        end
+
+        output = "#{Origen.app.root}/simulation"
+        FileUtils.mkdir(output) unless Dir.exist?(output)
+
+        puts "Unpakcing Testbench into #{output}"
+        system "tar vxzf #{testbench} -C #{output} #{ARGV[0]}"
+      end
+
+      def self.list(options = {})
+      end
+    end
+  end
+end

data/lib/origen_sim/simulator.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'io/wait'
 module OrigenSim
   # Responsible for managing and communicating with the simulator
   # process, a single instance of this class is instantiated as
@@ -6,10 +7,16 @@ module OrigenSim
   class Simulator
     include Origen::PersistentCallbacks
 
-    VENDORS = [:icarus, :cadence, :synopsys]
+    VENDORS = [:icarus, :cadence, :synopsys, :generic]
 
-    attr_reader :socket, :failed, :configuration
+    attr_reader :socket, :failed, :configuration, :stderr, :stdout, :heartbeat
     alias_method :config, :configuration
+    # Returns the PID of the simulator process
+    attr_reader :pid
+
+    def initialize
+      @socket_ids = {}
+    end
 
     # When set to true the simulator will log all messages it receives, note that
     # this must be run in conjunction with -d supplied to the Origen command to actually
@@ -22,6 +29,22 @@ module OrigenSim
       end
     end
 
+    def testbench_top
+      config[:testbench_top] || 'origen'
+    end
+
+    def rtl_top
+      config[:rtl_top] || 'dut'
+    end
+
+    def generic_run_cmd
+      config[:generic_run_cmd]
+    end
+
+    def post_process_run_cmd
+      config[:post_process_run_cmd]
+    end
+
     def fetch_simulation_objects(options = {})
       sid = options[:id] || id
       ldir = "#{Origen.root}/simulation/#{sid}"
@@ -83,7 +106,7 @@ module OrigenSim
       FileUtils.rm_rf tmp_dir if File.exist?(tmp_dir)
     end
 
-    def configure(options)
+    def configure(options, &block)
       fail 'A vendor must be supplied, e.g. OrigenSim::Tester.new(vendor: :icarus)' unless options[:vendor]
       unless VENDORS.include?(options[:vendor])
         fail "Unknown vendor #{options[:vendor]}, valid values are: #{VENDORS.map { |v| ':' + v.to_s }.join(', ')}"
@@ -125,14 +148,6 @@ module OrigenSim
       end
     end
 
-    def pid_dir
-      @pid_dir ||= begin
-        d = "#{Origen.root}/tmp/origen_sim/pids"
-        FileUtils.mkdir_p(d)
-        d
-      end
-    end
-
     def wave_config_dir
       @wave_config_dir ||= begin
         d = "#{Origen.root}/config/waves/#{id}"
@@ -215,10 +230,42 @@ module OrigenSim
       when :synopsys
         cmd = "#{compiled_dir}/simv +socket+#{socket_id} -vpd_file origen.vpd"
 
+      when :generic
+        # Generic tester requires that a generic_run_command option/block be provided.
+        # This should either be a string, an array (which will be joined here), or a block that needs to return either
+        # a string or array. In the event of a block, the block will be given the simulator.
+        if generic_run_cmd
+          cmd = generic_run_cmd
+          if cmd.is_a?(Proc)
+            cmd = cmd.call(self)
+          end
+
+          if cmd.is_a?(Array)
+            # We'll join this together with the '; ' string. This means that each array element will be run
+            # sequentially.
+            cmd = cmd.join(' && ')
+          elsif !cmd.is_a?(String)
+            # If its Proc, it was already run, and if its a Array if would have gone into the other case.
+            # So, this is either another proc, not an array and not a string, so not sure what to do with this.
+            # Complain about the cmd.
+            fail "OrigenSim :generic_run_cmd is of class #{generic_run_cmd.class}. It must be either an Array, String, or a Proc that returns an Array or String."
+          end
+        else
+          fail 'OrigenSim Generic Toolchain/Vendor requires a :generic_run_cmd option/block to be provided. No options/block provided!'
+        end
+
       else
         fail "Run cmd not defined yet for simulator #{config[:vendor]}"
 
       end
+
+      # Allow the user to post-process the command. This should be a block which will be given two parameters:
+      # 1. the command, and 2. the simulation object (self).
+      # In the event of a generic tester, this *could* replace the launch command, but that's not the real intention,
+      # since a simulator could be made that inherits from a generic simulator setup and still post process the command.
+      cmd = post_process_run_cmd.call(cmd, self) if post_process_run_cmd
+      fail "OrigenSim: :post_process_run_cmd returned object of class #{cmd.class}. Must return a String." unless cmd.is_a?(String)
+
       cmd
     end
 
@@ -253,6 +300,20 @@ module OrigenSim
         cmd += " -session #{f}"
         cmd += ' &'
 
+      when :generic
+        # Since this could be anything, the simulator will need to set this up. But, once it is, we can print it here.
+        if config[:view_waveform_cmd]
+          cmd = config[:view_waveform_cmd]
+        else
+          Origen.log.warn 'OrigenSim cannot provide a view-waveform command for a :generic vendor.'
+          Origen.log.warn 'Please supply a view-waveform command though the :view_waveform_cmd option during the OrigenSim::Generic instantiation.'
+        end
+
+      else
+        # Print a warning stating an unknown vendor was reached here.
+        # This shouldn't happen, but just in case.
+        Origen.log.warn "OrigenSim does not know the command to view waveforms for vendor :#{config[:vendor]}!"
+
       end
       cmd
     end
@@ -270,31 +331,86 @@ module OrigenSim
     def start
       fetch_simulation_objects
 
+      # Socket used for Origen -> Verilog commands
       server = UNIXServer.new(socket_id)
-      verbose = Origen.debugger_enabled?
+      # Socket used to capture stdout from the simulator
+      stdout_socket_id = socket_id(:stdout)
+      # Socket used to capture stderr from the simulator
+      stderr_socket_id = socket_id(:stderr)
+      # Socket used to provide a heartbeat to let the Ruby process in charge of the simulator
+      # know that the mast Origen process is still alive. If the Origen process crashes and leaves
+      # the simulator running, the child process will automatically reap it after a couple of missed
+      # heartbeats
+      heartbeat_socket_id = socket_id(:heartbeat)
+      server_stdout = UNIXServer.new(stdout_socket_id)
+      server_stderr = UNIXServer.new(stderr_socket_id)
+      server_heartbeat = UNIXServer.new(heartbeat_socket_id)
       cmd = run_cmd + ' & echo \$!'
 
       launch_simulator = %(
         require 'open3'
+        require 'socket'
+        require 'io/wait'
+        require 'origen'
+
+        pid = nil
+
+        stdout_socket = UNIXSocket.new('#{stdout_socket_id}')
+        stderr_socket = UNIXSocket.new('#{stderr_socket_id}')
+        heartbeat = UNIXSocket.new('#{heartbeat_socket_id}')
+
+        begin
+
+          Dir.chdir '#{run_dir}' do
+            Open3.popen3('#{cmd}') do |stdin, stdout, stderr, thread|
+              pid = stdout.gets.strip.to_i
+              heartbeat.puts(pid.to_s)
+
+              # Listen for a heartbeat from the main Origen process every 5 seconds, kill the
+              # simulator after two missed heartbeats
+              Thread.new do
+                missed_heartbeats = 0
+                loop do
+                  sleep 5
+                  if heartbeat.ready?
+                    while heartbeat.ready? do
+                      heartbeat.gets
+                    end
+                    missed_heartbeats = 0
+                  else
+                    missed_heartbeats += 1
+                  end
+                  if missed_heartbeats > 1
+                    Process.kill('KILL', pid)
+                    exit!(1)
+                  end
+                end
+              end
 
-        Dir.chdir '#{run_dir}' do
-          Open3.popen3('#{cmd}') do |stdin, stdout, stderr, thread|
-            pid = stdout.gets.strip
-            File.open '#{pid_dir}/#{socket_number}', 'w' do |f|
-              f.puts pid
-            end
-            threads = []
-            threads << Thread.new do
-              until (line = stdout.gets).nil?
-                puts line if #{verbose ? 'true' : 'false'}
+              threads = []
+              threads << Thread.new do
+                until (line = stdout.gets).nil?
+                  stdout_socket.puts line
+                end
               end
-            end
-            threads << Thread.new do
-              until (line = stderr.gets).nil?
-                puts line
+              threads << Thread.new do
+                until (line = stderr.gets).nil?
+                  stderr_socket.puts line
+                end
               end
+              threads.each(&:join)
             end
-            threads.each(&:join)
+          end
+
+        ensure
+          # Make sure this process never finishes and leaves the simulator running
+          begin
+            # If the process already finished, then we will see an Errno exception.
+            # It does not harm anything, but looks ugly, so catch it here and ignore.
+            Process.kill('KILL', pid) if pid
+            0
+          rescue Errno::ESRCH => e
+            0
           end
         end
       )
@@ -303,6 +419,19 @@ module OrigenSim
       Process.detach(simulator_parent_process)
 
       timeout_connection(config[:startup_timeout] || 60) do
+        @heartbeat = server_heartbeat.accept
+        @pid = heartbeat.gets.chomp.to_i
+
+        # Send a heartbeat to the child process running the simulator every 5 seconds
+        Thread.new do
+          loop do
+            heartbeat.write("OK\n")
+            sleep 5
+          end
+        end
+
+        @stdout = server_stdout.accept
+        @stderr = server_stderr.accept
         @socket = server.accept
         @connection_established = true
         if @connection_timed_out
@@ -327,22 +456,9 @@ module OrigenSim
       Origen.listeners_for(:simulation_startup).each(&:simulation_startup)
     end
 
-    # Returns the pid of the simulator process
-    def pid
-      return @pid if @pid_set
-      @pid = File.readlines(pid_file).first.strip.to_i if File.exist?(pid_file)
-      @pid ||= 0
-      @pid_set = true
-      @pid
-    end
-
-    def pid_file
-      "#{Origen.root}/tmp/origen_sim/pids/#{socket_number}"
-    end
-
     # Returns true if the simulator process is running
     def running?
-      return false if pid == 0
+      return false unless pid
       begin
         Process.getpgid(pid)
         true
@@ -474,6 +590,7 @@ module OrigenSim
 
     def cycle(number_of_cycles)
       put("3^#{number_of_cycles}")
+      read_sim_output
     end
 
     # Blocks the Origen process until the simulator indicates that it has
@@ -484,11 +601,42 @@ module OrigenSim
       unless data.strip == 'OK!'
         fail 'Origen and the simulator are out of sync!'
       end
+      read_sim_output
+    end
+
+    def read_sim_output
+      while stdout.ready?
+        line = stdout.gets.chomp
+        if OrigenSim.error_strings.any? { |s| line =~ /#{s}/ } &&
+           !OrigenSim.error_string_exceptions.any? { |s| line =~ /#{s}/ }
+          @simulator_logged_errors = true
+          Origen.log.error "(STDOUT): #{line}"
+        else
+          if OrigenSim.verbose? ||
+             OrigenSim.log_strings.any? { |s| line =~ /#{s}/ }
+            Origen.log.info line
+          else
+            Origen.log.debug line
+          end
+        end
+      end
+      while stderr.ready?
+        line = stderr.gets.chomp
+        if OrigenSim.fail_on_stderr && !OrigenSim.stderr_string_exceptions.any? { |s| line =~ /#{s}/ }
+          # We're failing on stderr, so print its results and log as errors if its not an exception.
+          @stderr_logged_errors = true
+          Origen.log.error "(STDERR): #{line}"
+        elsif OrigenSim.verbose?
+          # We're not failing on stderr, or the string in stderr is an exception.
+          # Print the string as regular output if verbose is set, otherwise just ignore.
+          Origen.log.info line
+        end
+      end
     end
 
     # Returns the current simulation error count
     def error_count
-      peek('origen.debug.errors').to_i
+      peek("#{testbench_top}.debug.errors").to_i
     end
 
     # Returns the current value of the given net, or nil if the given path does not
@@ -546,7 +694,6 @@ module OrigenSim
 
         v = peek(path)
         return nil unless v
-
         # Setting a range of bits
         if lsb
           upper = v >> (msb + 1)
@@ -588,15 +735,16 @@ module OrigenSim
       Origen.listeners_for(:simulation_shutdown).each(&:simulation_shutdown)
       ended = Time.now
       end_simulation
-      # Give the simulator a few seconds to shut down, otherwise kill it
-      sleep 1 while running? && (Time.now - ended) < 10
-      Process.kill(15, pid) if running?
-      sleep 0.1
-      # Leave the pid file around if we couldn't verify the simulator
-      # has stopped
-      FileUtils.rm_f(pid_file) if File.exist?(pid_file) && !running?
-      @socket.close if @socket
+      # Give the simulator time to shut down
+      sleep 0.1 while running?
+      socket.close if socket
+      stderr.close if stderr
+      stdout.close if stdout
+      heartbeat.close if heartbeat
       File.unlink(socket_id) if File.exist?(socket_id)
+      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(:heartbeat)) if File.exist?(socket_id(:heartbeat))
     end
 
     def on_origen_shutdown
@@ -605,9 +753,11 @@ module OrigenSim
           Origen.log.debug 'Shutting down simulator...'
           unless @failed_to_start
             c = error_count
-            if c > 0
+            if c > 0 || @simulator_logged_errors || @stderr_logged_errors
               @failed = true
-              Origen.log.error "The simulation failed with #{c} errors!"
+              Origen.log.error "The simulation failed with #{c} errors!" if c > 0
+              Origen.log.error 'The simulation log reported errors!' if @simulator_logged_errors
+              Origen.log.error 'The simulation stderr reported errors!' if @stderr_logged_errors
             elsif !@simulation_completed_cleanly
               @failed = true
               Origen.log.error 'The simulation exited early!'
@@ -630,12 +780,10 @@ module OrigenSim
           puts
         end
       end
-    ensure
-      Process.kill(15, pid) if @enabled && running?
     end
 
-    def socket_id
-      @socket_id ||= "/tmp/#{socket_number}.sock"
+    def socket_id(type = nil)
+      @socket_ids[type] ||= "/tmp/#{socket_number}#{type}.sock"
     end
 
     def socket_number
@@ -654,7 +802,7 @@ module OrigenSim
         # release our process and then exit
         unless @connection_established
           @connection_timed_out = true
-          UNIXSocket.new(socket_id).puts(message)
+          UNIXSocket.new(socket_id).puts("Time out\n")
         end
       end
       yield

data/lib/origen_sim/tester.rb

@@ -5,8 +5,15 @@ module OrigenSim
 
     TEST_PROGRAM_GENERATOR = OrigenSim::Generator
 
-    def initialize(options = {})
-      simulator.configure(options)
+    def initialize(options = {}, &block)
+      # Use Origen's collector to allow options to be set either from the options hash, or from the block
+      if block_given?
+        opts = Origen::Utility.collector(hash: options, merge_method: :keep_hash, &block).to_hash
+      else
+        opts = options
+      end
+
+      simulator.configure(opts, &block)
       super()
     end
 

data/lib/origen_sim.rb

@@ -23,5 +23,82 @@ module OrigenSim
   def self.simulator
     @simulator
   end
+
+  # Provide some shortcut methods to set the vendor
+  def self.generic(options = {}, &block)
+    Tester.new(options.merge(vendor: :generic), &block)
+  end
+
+  def self.cadence(options = {}, &block)
+    Tester.new(options.merge(vendor: :cadence), &block)
+  end
+
+  def self.synopsys(optoins = {}, &block)
+    Tester.new(options.merge(vendor: :synopsys), &block)
+  end
+
+  def self.icarus(options = {}, &block)
+    Tester.new(options.merge(vendor: :icarus), &block)
+  end
+
+  def self.verbose=(val)
+    @verbose = val
+  end
+
+  def self.verbose?
+    !!(@verbose || Origen.debugger_enabled?)
+  end
+
+  def self.error_strings
+    @error_strings ||= ['ERROR']
+  end
+
+  def self.error_strings=(val)
+    unless val.is_a?(Array)
+      fail 'OrigenSim.error_strings can only be set to an array of string values!'
+    end
+    @error_strings = val
+  end
+
+  def self.error_string_exceptions
+    @error_string_exceptions ||= []
+  end
+
+  def self.error_string_exceptions=(val)
+    unless val.is_a?(Array)
+      fail 'OrigenSim.error_string_exceptions can only be set to an array of string values!'
+    end
+    @error_string_exceptions = val
+  end
+
+  def self.stderr_string_exceptions
+    @stderr_string_exceptions ||= []
+  end
+
+  def self.stderr_string_exceptions=(val)
+    unless val.is_a?(Array)
+      fail 'OrigenSim.error_string_exceptions can only be set to an array of string values!'
+    end
+    @stderr_string_exceptions = val
+  end
+
+  def self.log_strings
+    @log_strings ||= []
+  end
+
+  def self.log_strings=(val)
+    unless val.is_a?(Array)
+      fail 'OrigenSim.log_strings can only be set to an array of string values!'
+    end
+    @log_strings = val
+  end
+
+  def self.fail_on_stderr=(val)
+    @fail_on_stderr = val
+  end
+
+  def self.fail_on_stderr
+    defined?(@fail_on_stderr) ? @fail_on_stderr : true
+  end
 end
 OrigenSim.__instantiate_simulator__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_sim
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: 0.33.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: 0.33.1
 - !ruby/object:Gem::Dependency
   name: origen_testers
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,7 @@ files:
 - lib/origen_sim/commands/build.rb
 - lib/origen_sim/commands/ci.rb
 - lib/origen_sim/commands/co.rb
+- lib/origen_sim/commands/pack.rb
 - lib/origen_sim/flow.rb
 - lib/origen_sim/generator.rb
 - lib/origen_sim/origen/pins/pin.rb