feat(ut): compatible with released rtl

Author: cyril0124

gen.sh

@@ -1,47 +1,51 @@
 #!/bin/bash
 
-set -e
+# set -e
 
 RELEASE_RTL=1 make test-top-ut-release
 # RELEASE_RTL=1 MMIOBRIDGE_TOP=1 make test-top-ut
 
 rtl_dir=$(pwd)/build/release/TestTop
 gen_dir=$(pwd)/gen
+top_file=$gen_dir/TestTop.sv
 mkdir -p $gen_dir
 
+cp $rtl_dir/*.sv $gen_dir
 cp $rtl_dir/*.v $gen_dir
 rm $gen_dir/ClockGate.v
 
+set -e
+
 cp $(pwd)/xs-issue-e-b-difftest-verilog/rtl $gen_dir -r
 
 # Replace
-sed -i 's/TL2CHICoupledL2/bosc_TL2CHICoupledL2/g' $gen_dir/TestTop.v
+sed -i 's/TL2CHICoupledL2/bosc_TL2CHICoupledL2/g' $top_file
 
 # Delete
-sed -i '/\.io_hartId(l2_nodes_io_hartId),/d' $gen_dir/TestTop.v
-sed -i '/\.io_pfCtrlFromCore_.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_debugTopDown_.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_hint_bits_isGrantData.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_req_ready.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_req_kill.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_req_bits_isPrefetch.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_req_bits_size.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_ready.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_bits_paddr_0.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_gpf_st.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_gpf_instr.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_pf_st.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_pf_instr.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_af_st.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_af_instr.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_pmp_resp_st.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_pmp_resp_instr.*/d' $gen_dir/TestTop.v
-sed -i '/\.io_l2_tlb_req_pmp_resp_atomic.*/d' $gen_dir/TestTop.v
+sed -i '/\.io_hartId.*\(.*\),/d' $top_file
+sed -i '/\.io_pfCtrlFromCore_.*/d' $top_file
+sed -i '/\.io_debugTopDown_.*/d' $top_file
+# sed -i '/\.io_l2_hint_bits_isGrantData.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_req_ready.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_req_kill.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_req_bits_isPrefetch.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_req_bits_size.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_ready.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_bits_paddr_0.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_gpf_st.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_gpf_instr.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_pf_st.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_pf_instr.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_af_st.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_resp_bits_excp_0_af_instr.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_pmp_resp_st.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_pmp_resp_instr.*/d' $top_file
+sed -i '/\.io_l2_tlb_req_pmp_resp_atomic.*/d' $top_file
 
 # Append
-sed -i '/\.auto_in_0_a_bits_echo_isKeyword(l2_nodes_auto_in_0_a_bits_echo_isKeyword),/a .auto_in_0_a_bits_user_reqSource(0),' $gen_dir/TestTop.v
-sed -i '/\.auto_in_1_a_bits_echo_isKeyword(l2_nodes_auto_in_1_a_bits_echo_isKeyword),/a .auto_in_1_a_bits_user_reqSource(0),' $gen_dir/TestTop.v
-sed -i '/\.auto_in_2_a_bits_echo_isKeyword(l2_nodes_auto_in_2_a_bits_echo_isKeyword),/a .auto_in_2_a_bits_user_reqSource(0),' $gen_dir/TestTop.v
-sed -i '/\.auto_in_3_a_bits_echo_isKeyword(l2_nodes_auto_in_3_a_bits_echo_isKeyword),/a .auto_in_3_a_bits_user_reqSource(0),' $gen_dir/TestTop.v
+sed -i '/\.auto_in_0_a_bits_echo_isKeyword(l2_nodes_auto_in_0_a_bits_echo_isKeyword),/a .auto_in_0_a_bits_user_reqSource(0),' $top_file
+sed -i '/\.auto_in_1_a_bits_echo_isKeyword(l2_nodes_auto_in_1_a_bits_echo_isKeyword),/a .auto_in_1_a_bits_user_reqSource(0),' $top_file
+sed -i '/\.auto_in_2_a_bits_echo_isKeyword(l2_nodes_auto_in_2_a_bits_echo_isKeyword),/a .auto_in_2_a_bits_user_reqSource(0),' $top_file
+sed -i '/\.auto_in_3_a_bits_echo_isKeyword(l2_nodes_auto_in_3_a_bits_echo_isKeyword),/a .auto_in_3_a_bits_user_reqSource(0),' $top_file
 
 echo "gen.sh Finish"

src/test/scala/chi/TestTopForUT.scala

@@ -165,6 +165,8 @@ class CHIEmptyShell(splitFlit: Boolean)(implicit p: Parameters) extends  TL2CHIL
 class TestTopForUT(numCores: Int = 1, numULAgents: Int = 1, banks: Int = 1, mmioBridgeTop: Boolean = false)(implicit p: Parameters) extends LazyModule
   with HasCHIMsgParameters {
 
+  val isReleaseRTL = sys.env.getOrElse("RELEASE_RTL", "0") == "1"
+
   assert(numCores == 1)
 
   override lazy val desiredName: String = "TestTop"
@@ -192,14 +194,14 @@ class TestTopForUT(numCores: Int = 1, numULAgents: Int = 1, banks: Int = 1, mmio
     masterNode
   }
 
-  val l1d_nodes = (0 until numCores).map(i => createClientNode(s"l1d$i", 64))
+  val l1d_nodes = (0 until numCores).map(i => createClientNode(s"l1d$i", if(isReleaseRTL) 16 else 64))
   val l1i_nodes = (0 until numCores).map {i =>
     (0 until numULAgents).map { j =>
       TLClientNode(Seq(
         TLMasterPortParameters.v1(
           clients = Seq(TLMasterParameters.v1(
             name = s"l1i${i}_${j}",
-            sourceId = IdRange(0, 63)
+            sourceId = IdRange(0, (if(isReleaseRTL) 16 else 64) - 1)
           ))
         )
       ))
@@ -233,7 +235,7 @@ class TestTopForUT(numCores: Int = 1, numULAgents: Int = 1, banks: Int = 1, mmio
       TLMasterPortParameters.v1(
         clients = Seq(TLMasterParameters.v1(
           name = "cmo",
-          sourceId = IdRange(0, 7),
+          sourceId = IdRange(0, 8 - 1),
         )),
         requestFields = Nil
       )