Fix for #31

Origen-SDK · Sep 13, 2019 · c8798ac · c8798ac
1 parent 496c6cd
commit c8798ac
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 40 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 # This gem provides integration with https://coveralls.io/ to monitor
 # your application's test coverage
 gem 'coveralls', require: false
-gem 'byebug', '~>9'
+gem 'byebug'
 gem 'origen_doc_helpers'
 gem 'origen_jtag', '~>0.20'
 # Uncomment these if you want to use a visual debugger (e.g. Visual Studio Code) to debug your app

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -22,7 +22,7 @@ GEM
       origen (>= 0.2.3)
       sexpistol (~> 0.0)
     builder (3.2.3)
-    byebug (9.1.0)
+    byebug (11.0.1)
     coderay (1.1.2)
     colored (1.2)
     colorize (0.8.1)
@@ -37,40 +37,30 @@ GEM
       colored (~> 1.2)
     dentaku (2.0.11)
     diff-lcs (1.3)
-    docile (1.3.1)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    geminabox (0.12.4)
-      builder
-      faraday
-      httpclient (>= 2.2.7)
-      nesty
-      sinatra (>= 1.2.7)
+    docile (1.3.2)
+    dry-inflector (0.1.2)
     gems (0.8.3)
     highline (1.7.10)
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (2.2.0)
     kramdown (1.17.0)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.0904)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
     nanoc (3.7.5)
       cri (~> 2.3)
-    nesty (1.0.2)
     net-ldap (0.16.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
-    origen (0.51.3)
+    origen (0.54.0)
       activesupport (~> 4.1)
       bundler (~> 1.7)
       coderay (~> 1.1)
@@ -79,7 +69,6 @@ GEM
       concurrent-ruby
       cri (~> 2.10.0)
       dentaku (~> 2)
-      geminabox (= 0.12.4)
       gems (~> 0.8)
       highline (~> 1.7)
       httparty (~> 0.13)
@@ -94,91 +83,90 @@ GEM
       rubocop (= 0.30)
       scrub_rb (~> 1.0)
       simplecov (~> 0.9)
-      sinatra (~> 1)
       thor (~> 0.19)
       yard (~> 0.8)
-    origen_doc_helpers (0.8.0)
+    origen_doc_helpers (0.8.2)
       origen (>= 0.7.15)
-    origen_jtag (0.21.1)
+    origen_jtag (0.22.0)
       origen (~> 0.7, >= 0.7.35)
       origen_testers (>= 0.13.2)
     origen_stil (0.2.1)
       ast (~> 2)
       origen (>= 0.33.3)
       treetop
-    origen_testers (0.21.0)
+    origen_testers (0.42.0)
+      ast (~> 2)
       atp (~> 1.1, >= 1.1.3)
       origen (>= 0.44.0)
       origen_stil (>= 0.2.1)
       require_all (~> 1)
+      rodf (~> 1)
+      sexpistol (~> 0.0)
     origen_verilog (0.6.2)
       ast (~> 2)
       origen (>= 0.41.0)
       treetop
-    parser (2.6.3.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
     polyglot (0.3.5)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (1.6.11)
-    rack-protection (1.5.5)
-      rack
     rainbow (2.2.2)
       rake
     rake (10.5.0)
     require_all (1.5.0)
+    rodf (1.1.0)
+      builder (>= 3.0)
+      dry-inflector (~> 0.1)
+      rubyzip (>= 1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-legacy_formatters (1.0.1)
       rspec (~> 3.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.30.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.10.1)
+    rubyzip (1.2.4)
     scrub_rb (1.0.1)
     sexpistol (0.0.7)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
-    tins (1.20.2)
+    tins (1.21.1)
     treetop (1.6.10)
       polyglot (~> 0.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    yard (0.9.19)
+    yard (0.9.20)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug (~> 9)
+  byebug
   coveralls
   origen_doc_helpers
   origen_jtag (~> 0.20)

diff --git a/lib/origen_sim/commands/build.rb b/lib/origen_sim/commands/build.rb
@@ -140,6 +140,7 @@ def _exit_fail_
                            options:           {
                              vendor:            :cadence,
                              top:               dut.name,
+                             testbench_name:    options[:testbench_name],
                              incl:              options[:incl_files],
                              device_name:       options[:device_name],
                              revision:          options[:revision],

diff --git a/templates/rtl_v/origen.v.erb b/templates/rtl_v/origen.v.erb
@@ -255,7 +255,7 @@ endmodule
 //            | |                                                 
 //            |_|                                                 
 
-module origen;
+module <%= options[:testbench_name] || 'origen' %>;
 
   reg finish = 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -255,7 +255,7 @@ endmodule @@
     //            | |
     //            |_|
-    module origen;
+    module <%= options[:testbench_name] || 'origen' %>;
       reg finish = 0;
@@ Expand Down @@