diff --git a/.github/workflows/scenario-CoupledL2.yml b/.github/workflows/scenario-CoupledL2.yml
index bafafd0..29549bd 100644
--- a/.github/workflows/scenario-CoupledL2.yml
+++ b/.github/workflows/scenario-CoupledL2.yml
@@ -335,12 +335,12 @@ jobs:
       run: |
         make run
 
-    # - name: Tar up repository
-    #   working-directory: ${{ github.workspace }}
-    #   run: tar -zcf ${{ env.RUN_ARCHIVE }} repo
-
-    # - name: Upload artifact
-    #   uses: actions/upload-artifact@v4
-    #   with:
-    #     path: ${{ github.workspace }}/${{ env.RUN_ARCHIVE }}
-    #     name: ${{ env.RUN_ARCHIVE }}
+#   - name: Tar up repository
+#     working-directory: ${{ github.workspace }}
+#     run: tar -zcf ${{ env.RUN_ARCHIVE }} repo
+
+#   - name: Upload artifact
+#     uses: actions/upload-artifact@v4
+#     with:
+#       path: ${{ github.workspace }}/${{ env.RUN_ARCHIVE }}
+#       name: ${{ env.RUN_ARCHIVE }}
diff --git a/.github/workflows/scenario-OpenLLC.yml b/.github/workflows/scenario-OpenLLC.yml
index 89c67ce..ae0692b 100644
--- a/.github/workflows/scenario-OpenLLC.yml
+++ b/.github/workflows/scenario-OpenLLC.yml
@@ -40,19 +40,19 @@ jobs:
       OPENLLC_ARCHIVE: openLLC-${{ matrix.case.id }}-${{ github.sha }}.tar.gz
 
     steps:
-
+    
     - name: Checkout
       uses: actions/checkout@v4
       with:
         path: repo
 
-    - name: Checkout CoupledL2
-      run: git submodule update --init dut/CoupledL2
+    - name: Checkout OpenLLC
+      run: git submodule update --init dut/OpenLLC
 
     - name: Extract submodule SHA
-      id: get_sha_CoupledL2
+      id: get_sha_OpenLLC
       run: |
-        cd dut/CoupledL2
+        cd dut/OpenLLC
         CURRENT_HASH=$(git rev-parse HEAD)
         echo "${CURRENT_HASH}"
         echo "CURRENT_HASH=${CURRENT_HASH}" >> $GITHUB_ENV
@@ -84,7 +84,7 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
         make openLLC-compile
-
+  
     - name: Build verilog
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
@@ -93,7 +93,7 @@ jobs:
     - name: Tar up repository
       if: steps.cache.outputs.cache-hit != 'true'
       working-directory: ${{ github.workspace }}
-      run: tar -zcf ${{ env.OPENLLC_ARCHIVE }} repo/dut/CoupledL2/build
+      run: tar -zcf ${{ env.OPENLLC_ARCHIVE }} repo/dut/OpenLLC/build
 
   setup-verilator:
     strategy:
@@ -151,7 +151,7 @@ jobs:
       run: tar -zcf ${{ env.VERILATOR_ARCHIVE }} verilator
 
   build:
-    needs:
+    needs: 
       - prebuild-ootb-openLLC
       - setup-verilator
     strategy:
@@ -172,7 +172,7 @@ jobs:
       CC: ${{ matrix.compiler.cc }}
       CXX: ${{ matrix.compiler.cxx }}
       OPENLLC_ARCHIVE: openLLC-${{ matrix.case.id }}-${{ github.sha }}.tar.gz
-      TLTEST_ARCHIVE: tl-test-new-openLLC-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
+      TLTEST_ARCHIVE: tl-test-new-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
       VERILATOR_ARCHIVE: verilator-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
     steps:
 
@@ -181,8 +181,8 @@ jobs:
       with:
         path: repo
 
-    - name: Checkout CoupledL2
-      run: git submodule update --init dut/CoupledL2
+    - name: Checkout OpenLLC
+      run: git submodule update --init dut/OpenLLC
 
     - name: Setup Clang 16
       if: matrix.compiler.cc == 'clang-16'
@@ -210,10 +210,10 @@ jobs:
         verilator --version
 
     - name: Extract submodule SHA
-      id: get_sha_CoupledL2
+      id: get_sha_OpenLLC
       working-directory: ${{ github.workspace }}
       run: |
-        cd repo/dut/CoupledL2
+        cd repo/dut/OpenLLC
         CURRENT_HASH=$(git rev-parse HEAD)
         echo "${CURRENT_HASH}"
         echo "CURRENT_HASH=${CURRENT_HASH}" >> $GITHUB_ENV
@@ -278,8 +278,8 @@ jobs:
       CI_RUNS_ON: ${{ matrix.os }}
       CC: ${{ matrix.compiler.cc }}
       CXX: ${{ matrix.compiler.cxx }}
-      TLTEST_ARCHIVE: tl-test-new-openLLC-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
-      RUN_ARCHIVE: tl-test-new-openLLC-run-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
+      TLTEST_ARCHIVE: tl-test-new-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
+      RUN_ARCHIVE: tl-test-new-run-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
     steps:
 
     - name: Download artifact
diff --git a/.gitmodules b/.gitmodules
index be78790..a559c39 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "dut/CoupledL2"]
 	path = dut/CoupledL2
 	url = https://github.com/OpenXiangShan/CoupledL2.git
+[submodule "dut/OpenLLC"]
+	path = dut/OpenLLC
+	url = https://github.com/OpenXiangShan/OpenLLC.git
diff --git a/Makefile b/Makefile
index 2ff23f3..6b059b2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ endif
 init:
 	git submodule update --init --recursive
 	$(MAKE) -C ./dut/CoupledL2 init
+	$(MAKE) -C ./dut/OpenLLC init
 
 FORCE:
 
@@ -38,15 +39,15 @@ tltest-prepare-v3-coupledL2:
 
 tltest-prepare-all-openLLC:
 	cmake ./main -B ./main/build -DBUILD_DPI=ON -DBUILD_V3=ON $(CMAKE_CXX_COMPILER) \
-		-DDUT_PATH="${PWD}/dut/CoupledL2"
+		-DDUT_PATH="${PWD}/dut/OpenLLC"
 
 tltest-prepare-dpi-openLLC:
 	cmake ./main -B ./main/build -DBUILD_DPI=ON -DBUILD_V3=OFF $(CMAKE_CXX_COMPILER) \
-		-DDUT_PATH="${PWD}/dut/CoupledL2"
+		-DDUT_PATH="${PWD}/dut/OpenLLC"
 
 tltest-prepare-v3-openLLC:
 	cmake ./main -B ./main/build -DBUILD_V3=ON -DBUILD_DPI=OFF $(CMAKE_CXX_COMPILER) \
-		-DDUT_PATH="${PWD}/dut/CoupledL2"
+		-DDUT_PATH="${PWD}/dut/OpenLLC"
 
 
 tltest-portgen:
@@ -106,32 +107,32 @@ tltest-build-v3-openLLC: tltest-prepare-v3-openLLC tltest-build
 
 
 coupledL2-compile:
-	$(MAKE) -C ./dut/CoupledL2 compile-coupledl2
+	$(MAKE) -C ./dut/CoupledL2 compile
 
 coupledL2-verilog-test-top-l2l3:
-	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3-huancun
+	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3
 
 coupledL2-verilog-test-top-l2l3l2:
-	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2-huancun
+	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2
 
 coupledL2-verilog-clean:
 	$(MAKE) -C ./dut/CoupledL2 clean
 
 openLLC-compile:
-	$(MAKE) -C ./dut/CoupledL2 compile-openllc
+	$(MAKE) -C ./dut/OpenLLC compile
 
 openLLC-verilog-test-top-l2l3:
-	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3-openllc
+	$(MAKE) -C ./dut/OpenLLC test-top-l2l3
 
 openLLC-verilog-test-top-l2l3l2:
-	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2-openllc
+	$(MAKE) -C ./dut/OpenLLC test-top-l2l3l2
 
 openLLC-verilog-clean:
-	$(MAKE) -C ./dut/CoupledL2 clean
+	$(MAKE) -C ./dut/OpenLLC clean
 
 
 VERILATOR := verilator
-VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/coupledl2/*.*v \
+VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/*.*v \
 		--Mdir ./verilated \
 		-O3 \
 		--trace-fst \
@@ -139,7 +140,7 @@ VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/coupledl2/*.*v \
 		--build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) \
 		-DSIM_TOP_MODULE_NAME=TestTop \
 		-Wno-fatal
-VERILATOR_COMMON_ARGS_OPENLLC := ./dut/CoupledL2/build/openllc/*.*v \
+VERILATOR_COMMON_ARGS_OPENLLC := ./dut/OpenLLC/build/*.*v \
 		--Mdir ./verilated \
 		-O3 \
 		--trace-fst \
@@ -161,7 +162,7 @@ coupledL2-verilate-build:
 coupledL2-verilate:
 	rm -rf verilated
 	mkdir verilated
-	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/coupledl2/*.*v -Wno-fatal \
+	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/*.*v -Wno-fatal \
 		--top TestTop --build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) -DSIM_TOP_MODULE_NAME=TestTop
 
 coupledL2-verilate-clean:
@@ -180,7 +181,7 @@ openLLC-verilate-build:
 openLLC-verilate:
 	rm -rf verilated
 	mkdir verilated
-	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/openllc/*.*v -Wno-fatal \
+	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/OpenLLC/build/*.*v -Wno-fatal \
 		--top TestTop --build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) -DSIM_TOP_MODULE_NAME=TestTop
 
 openLLC-verilate-clean:
diff --git a/dut/CoupledL2 b/dut/CoupledL2
index 61376ef..800bb00 160000
--- a/dut/CoupledL2
+++ b/dut/CoupledL2
@@ -1 +1 @@
-Subproject commit 61376ef968fe8b52e2e1aadcfa9f5448e4306d8e
+Subproject commit 800bb00c894bae89951412cec02d02ea49d7f90f
diff --git a/dut/OpenLLC b/dut/OpenLLC
new file mode 160000
index 0000000..484d1ac
--- /dev/null
+++ b/dut/OpenLLC
@@ -0,0 +1 @@
+Subproject commit 484d1ac6f796c320d3414222819721bba0c02d8c