diff --git a/third_party/UHDM b/third_party/UHDM
index ef68042f4e..de36d8e5ec 160000
--- a/third_party/UHDM
+++ b/third_party/UHDM
@@ -1 +1 @@
-Subproject commit ef68042f4ed5afe8d76b20a9874f0fb494c20528
+Subproject commit de36d8e5ec15bb1e80783a28d50c7b0fa3b69fd4
diff --git a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
index 2689c13923..027450c064 100644
--- a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
+++ b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
@@ -64,20 +64,20 @@ Running: cd ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess;
 -- Configuring done
 -- Generating done
 -- Build files have been written to: ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess
-[  6%] Generating 11_ifu_bp_ctl.sv
-[ 12%] Generating 10_lsu_bus_intf.sv
+[  6%] Generating 10_lsu_bus_intf.sv
+[ 12%] Generating 11_ifu_bp_ctl.sv
 [ 18%] Generating 12_beh_lib.sv
 [ 25%] Generating 13_ifu_mem_ctl.sv
+[ 31%] Generating 14_mem_lib.sv
 [ 37%] Generating 15_exu.sv
-[ 37%] Generating 14_mem_lib.sv
 [ 43%] Generating 16_dec_decode_ctl.sv
 [ 50%] Generating 1_lsu_stbuf.sv
 [ 56%] Generating 2_ahb_to_axi4.sv
 [ 62%] Generating 3_rvjtag_tap.sv
-[ 68%] Generating 4_dec_tlu_ctl.sv
-[ 75%] Generating 5_lsu_bus_buffer.sv
-[ 81%] Generating 6_dbg.sv
-[ 87%] Generating 7_axi4_to_ahb.sv
+[ 75%] Generating 4_dec_tlu_ctl.sv
+[ 68%] Generating 5_lsu_bus_buffer.sv
+[ 81%] Generating 7_axi4_to_ahb.sv
+[ 93%] Generating 6_dbg.sv
 [ 93%] Generating 8_ifu_aln_ctl.sv
 [100%] Generating 9_tb_top.sv
 [100%] Built target Parse
diff --git a/third_party/tests/Tnoc/Tnoc.log b/third_party/tests/Tnoc/Tnoc.log
index 1730182e53..3af30164ae 100644
--- a/third_party/tests/Tnoc/Tnoc.log
+++ b/third_party/tests/Tnoc/Tnoc.log
@@ -4107,9 +4107,39 @@ var_select                                           185
 
 ============================== Begin Linting Results ==============================
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/bcm/tbcm_onehot.sv:65:14: Non synthesizable construct, __onehot
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_address_decoder_if.sv:12:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_address_decoder_if.sv:12:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_address_decoder_if.sv:12:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_address_decoder_if.sv:12:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_address_decoder_if.sv:12:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_address_decoder_if.sv:12:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/bcm/tbcm_round_robin_arbiter.sv:69:23: Non synthesizable construct, mux
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/bcm/tbcm_round_robin_arbiter.sv:82:36: Non synthesizable construct, to_onehot
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/router/tnoc_error_checker.sv:295:29: Non synthesizable construct, calc_burst_length
+[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/router/tnoc_error_checker.sv:48:21: Non synthesizable construct, get_head_flit_valid
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/router/tnoc_error_checker.sv:118:25: Non synthesizable construct, get_tail_flit_ack
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/router/tnoc_error_checker.sv:121:25: Non synthesizable construct, get_head_flit_valid
@@ -4143,27 +4173,6 @@ var_select                                           185
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_vc_arbiter.sv:67:37: Non synthesizable construct, get_head_flit_valid
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_vc_arbiter.sv:68:37: Non synthesizable construct, get_tail_flit_ack
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_vc_mux.sv:51:38: Non synthesizable construct, mux
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:18:18: Unresolved hierarchical path, PACKET_CONFIG.address_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:22:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
-[LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_types.sv:21:18: Unresolved hierarchical path, PACKET_CONFIG.data_width
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/router/tnoc_route_selector.sv:48:26: Non synthesizable construct, get_head_flit_valid
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_flit_if_demux.sv:34:48: Non synthesizable construct, demux
 [LINT]: ${SURELOG_DIR}/third_party/tests/Tnoc/cores/tnoc/rtl/common/tnoc_flit_if_demux.sv:35:48: Non synthesizable construct, mux