origen_sim 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ddb2d142b91e167ae6ad4edddeb93a25aa22ce9ae57d771158329416f0f5b6
-  data.tar.gz: 45d794e47570c784b8815ef8c7f8cd095ae93048c27bec8dd05cedec2614e514
+  metadata.gz: 8a78d741a8ea363189233e8e227acb4f8c070697b21938ec6120233cf80f1b03
+  data.tar.gz: 7ef47fe8101f15e47314964d18f0f8634b8dfc6b902738ace2ccf5bc16bc19cd
 SHA512:
-  metadata.gz: 44c72049e0a7c9ec50e4862db21dba4b972731afdadf79643c4fe29a11647f14071263498aad30c39e1313aa62f48b8d530c173e8e19ed9fde6a2a23cd5e0231
-  data.tar.gz: 18a952cad38daaf3ad78c4d2854f9f848714b26990621ae6999b3e3c7ea213b3bfb606164ee61e1da2813410ea8ba4a5871487b334da1d61347ec26dfe4cb912
+  metadata.gz: 1dd4cdf7fc522415fc23fab1a2b94d20568f4abc4e2802a92cfa207025fb253377644d4fe3b301093304b82d172b594f0981e970e0c300ee54af6fff1ab4f56c
+  data.tar.gz: a5480eda1a16b2e9613bcd6d5ac050d422bc85eb0f2a6a6e5df9a3ccc7565b719b8bc1059e597ebf20c9a886314dee13bb8d781def7996b6cf93444ea715f877

data/config/version.rb

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

data/ext/bridge.c

@@ -1084,10 +1084,12 @@ PLI_INT32 bridge_on_miscompare(PLI_BYTE8 * user_dat) {
 
     vpi_free_object(argv);
 
-    if (received) {
+    if (received == 1 || received == 0) {
       origen_log(LOG_ERROR, "Miscompare on pin %s, expected %d received %d", pin_name, expected, received);
+    } else if (received == -2) {
+      origen_log(LOG_ERROR, "Miscompare on pin %s, expected %d received Z", pin_name, expected);
     } else {
-      origen_log(LOG_ERROR, "Miscompare on pin %s, expected %d received X or Z", pin_name, expected);
+      origen_log(LOG_ERROR, "Miscompare on pin %s, expected %d received X", pin_name, expected);
     }
 
     error_count++;
@@ -1116,11 +1118,7 @@ PLI_INT32 bridge_on_miscompare(PLI_BYTE8 * user_dat) {
         strcpy((*miscompare).pin_name, pin_name);
         (*miscompare).cycle = cycle_count;
         (*miscompare).expected = expected;
-        if (received) {
-          (*miscompare).received = received;
-        } else {
-          (*miscompare).received = -1;
-        }
+        (*miscompare).received = received;
       }
       transaction_error_count++;
     }

data/lib/origen_sim/stdout_reader.rb

@@ -10,27 +10,25 @@ module OrigenSim
       @last_message_at = Time.now
       super do
         begin
-          line = ''
+          line = nil
           while @continue
             loop do
               out = @socket.gets
-              if out.nil?
-                line += ''
-                break
-              end
+              break if out.nil?
 
-              unless line.empty?
+              unless !line || 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
 
+              line ||= ''
               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.
+                # Either a single message or the end of a multi-part message.
                 # Add this to the line break to print the output to the console.
                 line += out
                 break
@@ -71,7 +69,7 @@ module OrigenSim
                   end
                 end
               end
-              line = ''
+              line = nil
               @last_message_at = Time.now
             end
           end

data/lib/origen_sim/tester.rb

@@ -328,7 +328,7 @@ module OrigenSim
                 end
 
                 diffs.each do |position, received, expected|
-                  if received == -1
+                  if received == -1 || received == -2
                     reg_or_val[position].unknown = true
                   else
                     reg_or_val[position].data = received
@@ -377,7 +377,7 @@ module OrigenSim
             if actual_data_available
               actual = reg_or_val
               diffs.each do |position, received, expected|
-                if received == -1
+                if received == -1 || received == -2
                   actual = '?' * reg_or_val.to_s(16).size
                   break
                 elsif received == 1

data/pattern/fails.rb

@@ -0,0 +1,19 @@
+# This pattern is expected to fail, use it to visually inspect that OrigenSim's
+# error reporting is working
+Pattern.create do
+  ss "Test a register-level miscompare"
+  dut.cmd.write!(0x1234_5678)
+  dut.cmd.read!(0x1233_5678)
+
+  ss "Test a bit-level miscompare, expect 1"
+  dut.ana_test.write!(0)
+  dut.ana_test.bgap_out.read!(1)
+  ss "Test a bit-level miscompare, expect 0"
+  dut.ana_test.bgap_out.write!(1)
+  dut.ana_test.bgap_out.read!(0)
+
+  if tester.sim?
+    ss "Test reading an X register value, expect LSB nibble to be 0"
+    dut.x_reg[3..0].read!(0)
+  end
+end

data/pattern/test.rb

@@ -184,9 +184,6 @@ Pattern.create do
     unless dut.parallel_read.data == 0x7707_7077
       OrigenSim.error "PARALLEL_READ register did not sync from simulation"
     end
-
-    #ss "Test reading an X register value"
-    #dut.x_reg.read!(0)
   end
 
   ss "Do some operations with the counter, just for fun"

data/templates/rtl_v/origen.v.erb

@@ -62,7 +62,12 @@ module pin_driver(pin, sync);
   // pin compare failure logger
   always @(posedge error) begin
     //$display("!4![%t] Miscompare on pin %s, expected %d received %d", $time, pin_name, data[0], pin);
-    $bridge_on_miscompare(pin_name, data[0], pin);
+    if (pin == 1'b0 || pin == 1'b1)
+      $bridge_on_miscompare(pin_name, data[0], pin);
+    else if (pin == 1'bz)
+      $bridge_on_miscompare(pin_name, data[0], -2);
+    else
+      $bridge_on_miscompare(pin_name, data[0], -1);
   end
   
   // SMcG - needs more work, causes non-genuine fails in OrigenSim test case

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_sim
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -99,6 +99,7 @@ files:
 - lib/origen_sim_dev/ip.rb
 - lib/tasks/origen_sim.rake
 - pattern/concurrent_ip.rb
+- pattern/fails.rb
 - pattern/ip1_test.rb
 - pattern/ip2_test.rb
 - pattern/test.rb