Skip to content

Revert "refactor(OpenLLC): remove dut/OpenLLC and update CoupledL2 " #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yan-Yiming merged 1 commit into from
Apr 9, 2026
Merged

Revert "refactor(OpenLLC): remove dut/OpenLLC and update CoupledL2 " #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/scenario-CoupledL2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
30 changes: 15 additions & 15 deletions .github/workflows/scenario-OpenLLC.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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:
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
run: tar -zcf ${{ env.VERILATOR_ARCHIVE }} verilator

build:
needs:
needs:
- prebuild-ootb-openLLC
- setup-verilator
strategy:
Expand All @@ -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:

Expand All @@ -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'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
29 changes: 15 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ endif
init:
git submodule update --init --recursive
$(MAKE) -C ./dut/CoupledL2 init
$(MAKE) -C ./dut/OpenLLC init

FORCE:

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -106,40 +107,40 @@ 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 \
--top TestTop \
--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 \
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dut/CoupledL2
Open in desktop
Submodule CoupledL2 updated 108 files
1 change: 1 addition & 0 deletions dut/OpenLLC
Open in desktop
Submodule OpenLLC added at 484d1a
Loading
⚡