From 96a868d38888fd30c9685df3c731a946d2da6c34 Mon Sep 17 00:00:00 2001
From: Scott Johnson <scottj@sifive.com>
Date: Fri, 19 Aug 2016 17:14:54 -0700
Subject: [PATCH] enable the TestDriver to be used in a SystemVerilog UVM-based
 testbench, which has its own way to manage end-of-simulation and does not
 like anyone else to call $finish

---
 vsrc/TestDriver.v | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/vsrc/TestDriver.v b/vsrc/TestDriver.v
index 8ddcb22c..4d5bd632 100644
--- a/vsrc/TestDriver.v
+++ b/vsrc/TestDriver.v
@@ -39,6 +39,11 @@ module TestDriver;
 `endif
   end
 
+`ifdef TESTBENCH_IN_UVM
+  // UVM library has its own way to manage end-of-simulation.
+  // A UVM-based testbench will raise an objection, watch this signal until this goes 1, then drop the objection.
+  reg finish_request = 1'b0;
+`endif
   reg [255:0] reason = "";
   reg failure = 1'b0;
   wire success;
@@ -73,7 +78,11 @@ module TestDriver;
         if (verbose)
           $fdisplay(stderr, "Completed after %d simulation cycles", trace_count);
         `VCDPLUSCLOSE
+`ifdef TESTBENCH_IN_UVM
+        finish_request = 1;
+`else
         $finish;
+`endif
       end
     end
   end