[otbn,dv] Simplify how we bind in trace interfaces
Using a hierarchical instance for the bind target makes things a bit
clearer (no problem if there are two hits, for example). Also, it
means we can just use a hierarchical reference to install the
interface in the UVM config db and don't need to mess around with the
otbn_trace_uvm_injector module.
Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>
diff --git a/hw/ip/otbn/dv/uvm/otbn_sim.core b/hw/ip/otbn/dv/uvm/otbn_sim.core
index de1200d..5cd960e 100644
--- a/hw/ip/otbn/dv/uvm/otbn_sim.core
+++ b/hw/ip/otbn/dv/uvm/otbn_sim.core
@@ -17,7 +17,6 @@
- lowrisc:ip:edn_pkg
files:
- tb.sv
- - otbn_trace_uvm_injector.sv
file_type: systemVerilogSource
targets:
diff --git a/hw/ip/otbn/dv/uvm/otbn_trace_uvm_injector.sv b/hw/ip/otbn/dv/uvm/otbn_trace_uvm_injector.sv
deleted file mode 100644
index 593c7be..0000000
--- a/hw/ip/otbn/dv/uvm/otbn_trace_uvm_injector.sv
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// A tiny fragment that grabs an otbn_trace_if interface and injects it into the UVM config
-// database. We can't do this directly in the testbench, because the interface itself is bound into
-// the DUT with a bind statement, so can't be accessed with a hierarchical reference.
-//
-// Instead, the testbench binds this module in to the DUT as well, allowing it to grab the trace
-// interface.
-
-module otbn_trace_uvm_injector(otbn_trace_if otbn_trace);
- initial begin
- uvm_config_db#(virtual otbn_trace_if)::set(null, "*.env", "trace_vif", otbn_trace);
- end
-endmodule
diff --git a/hw/ip/otbn/dv/uvm/tb.sv b/hw/ip/otbn/dv/uvm/tb.sv
index 233ba43..474e228 100644
--- a/hw/ip/otbn/dv/uvm/tb.sv
+++ b/hw/ip/otbn/dv/uvm/tb.sv
@@ -77,14 +77,12 @@
.edn_urnd_i ( edn_urnd_rsp )
);
- bind otbn_core otbn_trace_if #(
+ bind dut.u_otbn_core otbn_trace_if #(
.ImemAddrWidth (ImemAddrWidth),
.DmemAddrWidth (DmemAddrWidth)
) i_otbn_trace_if (.*);
- bind otbn_core otbn_tracer u_otbn_tracer(.*, .otbn_trace(i_otbn_trace_if));
-
- bind otbn_core otbn_trace_uvm_injector u_trace_injector (.otbn_trace(i_otbn_trace_if));
+ bind dut.u_otbn_core otbn_tracer u_otbn_tracer(.*, .otbn_trace(i_otbn_trace_if));
// OTBN model, wrapping an ISS.
//
@@ -132,6 +130,9 @@
uvm_config_db#(intr_vif)::set(null, "*.env", "intr_vif", intr_if);
uvm_config_db#(virtual otbn_model_if)::set(null, "*.env.model_agent", "vif", model_if);
+ uvm_config_db#(virtual otbn_trace_if)::set(null, "*.env", "trace_vif",
+ dut.u_otbn_core.i_otbn_trace_if);
+
$timeformat(-12, 0, " ps", 12);
run_test();
end
