Skip to content

Commit a585c4d

Browse files
Yan-YimingYan-Yiming
authored
Revert "refactor(OpenLLC): remove dut/OpenLLC and update CoupledL2 " (#89)
This reverts commit 08e0a21.
1 parent 08e0a21 commit a585c4d

File tree

6 files changed

+44
-39
lines changed

6 files changed

+44
-39
lines changed

‎.github/workflows/scenario-CoupledL2.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,12 @@ jobs:
335335
run: |
336336
make run
337337
338-
# - name: Tar up repository
339-
# working-directory: ${{ github.workspace }}
340-
# run: tar -zcf ${{ env.RUN_ARCHIVE }} repo
341-
342-
# - name: Upload artifact
343-
# uses: actions/upload-artifact@v4
344-
# with:
345-
# path: ${{ github.workspace }}/${{ env.RUN_ARCHIVE }}
346-
# name: ${{ env.RUN_ARCHIVE }}
338+
# - name: Tar up repository
339+
# working-directory: ${{ github.workspace }}
340+
# run: tar -zcf ${{ env.RUN_ARCHIVE }} repo
341+
342+
# - name: Upload artifact
343+
# uses: actions/upload-artifact@v4
344+
# with:
345+
# path: ${{ github.workspace }}/${{ env.RUN_ARCHIVE }}
346+
# name: ${{ env.RUN_ARCHIVE }}

‎.github/workflows/scenario-OpenLLC.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ jobs:
4040
OPENLLC_ARCHIVE: openLLC-${{ matrix.case.id }}-${{ github.sha }}.tar.gz
4141

4242
steps:
43-
43+
4444
- name: Checkout
4545
uses: actions/checkout@v4
4646
with:
4747
path: repo
4848

49-
- name: Checkout CoupledL2
50-
run: git submodule update --init dut/CoupledL2
49+
- name: Checkout OpenLLC
50+
run: git submodule update --init dut/OpenLLC
5151

5252
- name: Extract submodule SHA
53-
id: get_sha_CoupledL2
53+
id: get_sha_OpenLLC
5454
run: |
55-
cd dut/CoupledL2
55+
cd dut/OpenLLC
5656
CURRENT_HASH=$(git rev-parse HEAD)
5757
echo "${CURRENT_HASH}"
5858
echo "CURRENT_HASH=${CURRENT_HASH}" >> $GITHUB_ENV
@@ -84,7 +84,7 @@ jobs:
8484
if: steps.cache.outputs.cache-hit != 'true'
8585
run: |
8686
make openLLC-compile
87-
87+
8888
- name: Build verilog
8989
if: steps.cache.outputs.cache-hit != 'true'
9090
run: |
@@ -93,7 +93,7 @@ jobs:
9393
- name: Tar up repository
9494
if: steps.cache.outputs.cache-hit != 'true'
9595
working-directory: ${{ github.workspace }}
96-
run: tar -zcf ${{ env.OPENLLC_ARCHIVE }} repo/dut/CoupledL2/build
96+
run: tar -zcf ${{ env.OPENLLC_ARCHIVE }} repo/dut/OpenLLC/build
9797

9898
setup-verilator:
9999
strategy:
@@ -151,7 +151,7 @@ jobs:
151151
run: tar -zcf ${{ env.VERILATOR_ARCHIVE }} verilator
152152

153153
build:
154-
needs:
154+
needs:
155155
- prebuild-ootb-openLLC
156156
- setup-verilator
157157
strategy:
@@ -172,7 +172,7 @@ jobs:
172172
CC: ${{ matrix.compiler.cc }}
173173
CXX: ${{ matrix.compiler.cxx }}
174174
OPENLLC_ARCHIVE: openLLC-${{ matrix.case.id }}-${{ github.sha }}.tar.gz
175-
TLTEST_ARCHIVE: tl-test-new-openLLC-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
175+
TLTEST_ARCHIVE: tl-test-new-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
176176
VERILATOR_ARCHIVE: verilator-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
177177
steps:
178178

@@ -181,8 +181,8 @@ jobs:
181181
with:
182182
path: repo
183183

184-
- name: Checkout CoupledL2
185-
run: git submodule update --init dut/CoupledL2
184+
- name: Checkout OpenLLC
185+
run: git submodule update --init dut/OpenLLC
186186

187187
- name: Setup Clang 16
188188
if: matrix.compiler.cc == 'clang-16'
@@ -210,10 +210,10 @@ jobs:
210210
verilator --version
211211
212212
- name: Extract submodule SHA
213-
id: get_sha_CoupledL2
213+
id: get_sha_OpenLLC
214214
working-directory: ${{ github.workspace }}
215215
run: |
216-
cd repo/dut/CoupledL2
216+
cd repo/dut/OpenLLC
217217
CURRENT_HASH=$(git rev-parse HEAD)
218218
echo "${CURRENT_HASH}"
219219
echo "CURRENT_HASH=${CURRENT_HASH}" >> $GITHUB_ENV
@@ -278,8 +278,8 @@ jobs:
278278
CI_RUNS_ON: ${{ matrix.os }}
279279
CC: ${{ matrix.compiler.cc }}
280280
CXX: ${{ matrix.compiler.cxx }}
281-
TLTEST_ARCHIVE: tl-test-new-openLLC-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
282-
RUN_ARCHIVE: tl-test-new-openLLC-run-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
281+
TLTEST_ARCHIVE: tl-test-new-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
282+
RUN_ARCHIVE: tl-test-new-run-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
283283
steps:
284284

285285
- name: Download artifact

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "dut/CoupledL2"]
22
path = dut/CoupledL2
33
url = https://github.com/OpenXiangShan/CoupledL2.git
4+
[submodule "dut/OpenLLC"]
5+
path = dut/OpenLLC
6+
url = https://github.com/OpenXiangShan/OpenLLC.git

‎Makefile‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ endif
99
init:
1010
git submodule update --init --recursive
1111
$(MAKE) -C ./dut/CoupledL2 init
12+
$(MAKE) -C ./dut/OpenLLC init
1213

1314
FORCE:
1415

@@ -38,15 +39,15 @@ tltest-prepare-v3-coupledL2:
3839

3940
tltest-prepare-all-openLLC:
4041
cmake ./main -B ./main/build -DBUILD_DPI=ON -DBUILD_V3=ON $(CMAKE_CXX_COMPILER) \
41-
-DDUT_PATH="${PWD}/dut/CoupledL2"
42+
-DDUT_PATH="${PWD}/dut/OpenLLC"
4243

4344
tltest-prepare-dpi-openLLC:
4445
cmake ./main -B ./main/build -DBUILD_DPI=ON -DBUILD_V3=OFF $(CMAKE_CXX_COMPILER) \
45-
-DDUT_PATH="${PWD}/dut/CoupledL2"
46+
-DDUT_PATH="${PWD}/dut/OpenLLC"
4647

4748
tltest-prepare-v3-openLLC:
4849
cmake ./main -B ./main/build -DBUILD_V3=ON -DBUILD_DPI=OFF $(CMAKE_CXX_COMPILER) \
49-
-DDUT_PATH="${PWD}/dut/CoupledL2"
50+
-DDUT_PATH="${PWD}/dut/OpenLLC"
5051

5152

5253
tltest-portgen:
@@ -106,40 +107,40 @@ tltest-build-v3-openLLC: tltest-prepare-v3-openLLC tltest-build
106107

107108

108109
coupledL2-compile:
109-
$(MAKE) -C ./dut/CoupledL2 compile-coupledl2
110+
$(MAKE) -C ./dut/CoupledL2 compile
110111

111112
coupledL2-verilog-test-top-l2l3:
112-
$(MAKE) -C ./dut/CoupledL2 test-top-l2l3-huancun
113+
$(MAKE) -C ./dut/CoupledL2 test-top-l2l3
113114

114115
coupledL2-verilog-test-top-l2l3l2:
115-
$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2-huancun
116+
$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2
116117

117118
coupledL2-verilog-clean:
118119
$(MAKE) -C ./dut/CoupledL2 clean
119120

120121
openLLC-compile:
121-
$(MAKE) -C ./dut/CoupledL2 compile-openllc
122+
$(MAKE) -C ./dut/OpenLLC compile
122123

123124
openLLC-verilog-test-top-l2l3:
124-
$(MAKE) -C ./dut/CoupledL2 test-top-l2l3-openllc
125+
$(MAKE) -C ./dut/OpenLLC test-top-l2l3
125126

126127
openLLC-verilog-test-top-l2l3l2:
127-
$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2-openllc
128+
$(MAKE) -C ./dut/OpenLLC test-top-l2l3l2
128129

129130
openLLC-verilog-clean:
130-
$(MAKE) -C ./dut/CoupledL2 clean
131+
$(MAKE) -C ./dut/OpenLLC clean
131132

132133

133134
VERILATOR := verilator
134-
VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/coupledl2/*.*v \
135+
VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/*.*v \
135136
--Mdir ./verilated \
136137
-O3 \
137138
--trace-fst \
138139
--top TestTop \
139140
--build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) \
140141
-DSIM_TOP_MODULE_NAME=TestTop \
141142
-Wno-fatal
142-
VERILATOR_COMMON_ARGS_OPENLLC := ./dut/CoupledL2/build/openllc/*.*v \
143+
VERILATOR_COMMON_ARGS_OPENLLC := ./dut/OpenLLC/build/*.*v \
143144
--Mdir ./verilated \
144145
-O3 \
145146
--trace-fst \
@@ -161,7 +162,7 @@ coupledL2-verilate-build:
161162
coupledL2-verilate:
162163
rm -rf verilated
163164
mkdir verilated
164-
verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/coupledl2/*.*v -Wno-fatal \
165+
verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/*.*v -Wno-fatal \
165166
--top TestTop --build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) -DSIM_TOP_MODULE_NAME=TestTop
166167

167168
coupledL2-verilate-clean:
@@ -180,7 +181,7 @@ openLLC-verilate-build:
180181
openLLC-verilate:
181182
rm -rf verilated
182183
mkdir verilated
183-
verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/openllc/*.*v -Wno-fatal \
184+
verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/OpenLLC/build/*.*v -Wno-fatal \
184185
--top TestTop --build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) -DSIM_TOP_MODULE_NAME=TestTop
185186

186187
openLLC-verilate-clean:

‎dut/CoupledL2‎

Submodule CoupledL2 updated 108 files

‎dut/OpenLLC‎

Submodule OpenLLC added at 484d1ac

0 commit comments

Comments
 (0)
⚡