origen_sim 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c60c62df036a7a1a7c124f9408372f7f7394950
-  data.tar.gz: da386e483f43703251a5c963b39ebfdbf257f160
+  metadata.gz: e3d9900584dd6370a9bcc96c61d79731dd3f54c0
+  data.tar.gz: 79287986f985475310c43f51fc220d30430685c2
 SHA512:
-  metadata.gz: c2c477c36c977843a3d531aa8d722ad1b85da78ea1e53ea50783660817a9663adca034331ae8278bec177efbf5b5964fbd8e46d3b955c89fb40cf66ebf12ea83
-  data.tar.gz: eefada0ebe02bd85e5c71d266bcdf7eba95e15339115e66c591b750b855e293683a8e60de867b2a9c64e5f0ebc352d7da542119d8f21960cefc4fda8e9293f8a
+  metadata.gz: e6db91532f5e684b77b82b2eebba479fe0ede7abc242ecd1f3566621e090f71103a378ab1f89987edd67bed8ec78ccf671b34c6281f410a0ac7a29658dc387de
+  data.tar.gz: dbc381f99807bb2781ac7421b9b169e64f276eb03084256906c18ce3e11ad02aef44a4a568469a4c8b83cca935a48f1b153ebe7230ed1d312358690785b04927

data/config/shared_commands.rb

@@ -1,9 +1,15 @@
 # The requested command is passed in here as @command
 case @command
 
+when 'generate'
+  $use_fast_probe_depth = false
+  @application_options << ["--fast", "Fast simulation, minimum probe depth"]
+  $use_fast_probe_depth = true if ARGV.include?('--fast')
+
 when "origen_sim:build", "sim:build"
   require "origen_sim/commands/build"
   exit 0
+
 else
   @plugin_commands << <<-EOT
  sim:build       Build the simulation object for the current/given target

data/config/version.rb

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

data/lib/origen_sim/simulator.rb

@@ -129,15 +129,26 @@ module OrigenSim
                                    output:            tmp_dir,
                                    check_for_changes: false,
                                    quiet:             true,
-                                   options:           { dir: wave_dir, force: config[:force], setup: config[:setup] },
+                                   options:           { dir: wave_dir, force: config[:force], setup: config[:setup], depth: :all },
                                    output_file_name:  "#{id}.tcl"
         end
+        input_file_fast = "#{tmp_dir}/#{id}_fast.tcl"
+        if $use_fast_probe_depth
+          fast_probe_depth = config[:fast_probe_depth] || 1
+          Origen.app.runner.launch action:            :compile,
+                                   files:             "#{Origen.root!}/templates/probe.tcl.erb",
+                                   output:            tmp_dir,
+                                   check_for_changes: false,
+                                   quiet:             true,
+                                   options:           { dir: wave_dir, force: config[:force], setup: config[:setup], depth: fast_probe_depth },
+                                   output_file_name:  "#{id}_fast.tcl"
+        end
         wave_dir  # Ensure this exists since it won't be referenced above if the
         # input file is already generated
 
         cmd = configuration[:irun] || 'irun'
         cmd += " -r origen -snapshot origen +socket+#{socket_id}"
-        cmd += " -input #{input_file}"
+        cmd += $use_fast_probe_depth ? " -input #{input_file_fast}" : " -input #{input_file}"
         cmd += " -nclibdirpath #{compiled_dir}"
       end
       cmd

data/templates/probe.tcl.erb

@@ -1,5 +1,5 @@
 database -open waves -into <%= options[:dir] %> -default -event
-probe -create -shm origen -depth all -database waves
+probe -create -shm origen -depth <%= options[:depth] %> -database waves
 #probe -create -assertions -transaction origen -depth all -database waves
 
 % Hash(options[:force]).each do |net, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_sim
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen