Skip to content

Commit b5d0b77

Browse files
committed
Fixed broken spike-stf links to [condorcomputing](https://github.com/condorcomputing/condor.riscv-isa-sim)
1 parent b1a5e8f commit b5d0b77

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

traces/README.md

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Olympia. STFs are typically created by a RISC-V functional model that
3434
has been instrumented to generate one.
3535

3636
Two functional models which generate STFs are documented.
37-
[Spike-STF](https://github.com/jeffnye-gh/cpm.riscv-isa-sim)
37+
[Spike-STF](https://github.com/condorcomputing/condor.riscv-isa-sim)
3838
is the latest model,
3939
[Dromajo](https://github.com/chipsalliance/dromajo) also generates
4040
STFs.
@@ -123,7 +123,7 @@ cd build
123123

124124
## STF Inputs
125125

126-
Using the [stf_lib]() in the [Sparcians](https://github.com/sparcians)
126+
Using the [stf_lib](https://github.com/sparcians/stf_lib) in the [Sparcians](https://github.com/sparcians)
127127
repo, Olympia is capable of reading a RISC-V STF trace generated from
128128
a functional simulator. Included in Olympia (in this directory) are several trace files
129129

@@ -185,7 +185,7 @@ the macro tracing mode.
185185

186186
### Build Spike-STF
187187
The first step to generating an STF with Spike-STF is to clone and build
188-
the Spike-STF [repo](https://github.com/jeffnye-gh/cpm.riscv-isa-sim.git).
188+
the Spike-STF [repo](https://github.com/condorcomputing/condor.riscv-isa-sim).
189189

190190
This example uses the `riscv-perf-model/traces` directory as a working
191191
directory.
@@ -198,11 +198,12 @@ your path.
198198

199199
```bash
200200
cd riscv-perf-model/traces
201-
git clone https://github.com/jeffnye-gh/cpm.riscv-isa-sim.git --recursive
201+
git clone https://github.com/condorcomputing/condor.riscv-isa-sim.git --recurse-submodules
202202

203-
cd cpm.riscv-isa-sim
203+
cd condor.riscv-isa-sim
204204
bash scripts/download-bm-compiler.sh
205205
export PATH=`pwd`/riscv-embecosm-embedded-ubuntu2204-20250309/bin:$PATH
206+
which riscv64-unknown-elf-gcc #verify compiler is in your path
206207
```
207208
Exit the conda environment, if enabled, before compiling Spike-STF.
208209
```
@@ -221,14 +222,14 @@ The regress target executes the [riscv-tests](https://github.com/riscv-software-
221222
The compiler is a prebuilt RISC-V cross compiler from [Embecosm](https://embecosm.com/).
222223

223224
There is detailed information in the Spike-STF repo,
224-
[README_FORK.mk](https://github.com/jeffnye-gh/cpm.riscv-isa-sim/blob/spike_stf/README_FORK.md) and [USAGE.md](https://github.com/jeffnye-gh/cpm.riscv-isa-sim/blob/spike_stf/USAGE.md).
225+
[README_FORK.mk](https://github.com/condorcomputing/condor.riscv-isa-sim/blob/spike_stf/README_FORK.md) and [USAGE.md](https://github.com/condorcomputing/condor.riscv-isa-sim/blob/spike_stf/USAGE.md).
225226

226227
### Generating the Baremetal Dhrystone Traces
227228

228229
When Spike-STF is initially configured the dhrystone ELFs are created. If they need to be re-created:
229230

230231
```bash
231-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
232+
cd riscv-perf-model/traces/condor.riscv-isa-sim
232233
make -C dhrystone
233234
```
234235

@@ -237,12 +238,12 @@ optimization running 1000 iterations. The source code has been modified to
237238
add the trace macros and to allow simplified execution under baremetal with
238239
limited syscall support.
239240

240-
A discussion of the 3 optimization levels is available in [USAGE.md](https://github.com/jeffnye-gh/cpm.riscv-isa-sim/blob/spike_stf/USAGE.md#dhrystone-optimization-discussion).
241+
A discussion of the 3 optimization levels is available in [USAGE.md](https://github.com/condorcomputing/condor.riscv-isa-sim/blob/spike_stf/USAGE.md#dhrystone-optimization-discussion).
241242

242243
Once the ELFs are built, traces are generated by:
243244

244245
```
245-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
246+
cd riscv-perf-model/traces/condor.riscv-isa-sim
246247
247248
bash scripts/run-spike-stf.sh dhrystone/bin/dhrystone_opt1.1000.gcc.bare.riscv \
248249
dhrystone_opt1.zstf
@@ -257,9 +258,9 @@ The compressed trace outputs can then be run on olympia by
257258
```
258259
<cd to the directory containing olympia>
259260
260-
./olympia ../traces/cpm.riscv-isa-sim/trace_out/dhrystone_opt1.zstf
261-
./olympia ../traces/cpm.riscv-isa-sim/trace_out/dhrystone_opt2.zstf
262-
./olympia ../traces/cpm.riscv-isa-sim/trace_out/dhrystone_opt3.zstf
261+
./olympia ../traces/condor.riscv-isa-sim/trace_out/dhrystone_opt1.zstf
262+
./olympia ../traces/condor.riscv-isa-sim/trace_out/dhrystone_opt2.zstf
263+
./olympia ../traces/condor.riscv-isa-sim/trace_out/dhrystone_opt3.zstf
263264
```
264265
## Generating Linux Traces
265266

@@ -268,14 +269,14 @@ The compressed trace outputs can then be run on olympia by
268269
In order to compile applications for linux, you must have riscv64-unknown-linux-gnu-gcc in your path.
269270

270271
```
271-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
272+
cd riscv-perf-model/traces/condor.riscv-isa-sim
272273
bash scripts/download-lnx-compiler.sh
273274
export PATH=`pwd`/riscv64-embecosm-linux-gcc-ubuntu2204-20240407/bin:$PATH
274275
```
275276

276277
To build the linux version of the Dhrystone benchmarks:
277278
```
278-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
279+
cd riscv-perf-model/traces/condor.riscv-isa-sim
279280
make -C dhrystone bin-linux
280281
```
281282

@@ -297,11 +298,11 @@ The process to clone and build these components is contained in a script.
297298
This is a lengthy process.
298299

299300
```bash
300-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
301+
cd riscv-perf-model/traces/condor.riscv-isa-sim
301302
bash scripts/build-linux-collateral.sh
302303
```
303304

304-
Once complete, the directory `riscv-perf-model/traces/cpm.riscv-isa-sim/riscv-linux` will contain the files necessary to boot linux.
305+
Once complete, the directory `riscv-perf-model/traces/condor.riscv-isa-sim/riscv-linux` will contain the files necessary to boot linux.
305306
```
306307
fw_jump.elf
307308
rootfs.cpio
@@ -311,7 +312,7 @@ Image
311312
### Booting Linux on Spike-STF
312313
With the linux components built, boot linux using the helper script:
313314
```
314-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
315+
cd riscv-perf-model/traces/condor.riscv-isa-sim
315316
bash scripts/boot-linux.sh
316317
```
317318
The credentials are root/root.
@@ -331,7 +332,7 @@ the buildroot source tree, rebuilds rootfs, and copies the image to riscv-linux
331332
for use in the next section.
332333

333334
```
334-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
335+
cd riscv-perf-model/traces/condor.riscv-isa-sim
335336
bash scripts/build-trace-rootfs.sh
336337
```
337338

@@ -353,7 +354,7 @@ arguments. The first specifes the new rootfs and the second specifies the path
353354
for the STF trace output.
354355

355356
```
356-
cd riscv-perf-model/traces/cpm.riscv-isa-sim
357+
cd riscv-perf-model/traces/condor.riscv-isa-sim
357358
bash scripts/boot-linux.sh --rootfs ./riscv-linux/trace_rootfs.cpio \
358359
--trace ./trace_out/linux_trace.zstf
359360
```
@@ -405,7 +406,7 @@ This is useful in cases.
405406
For other use cases, check the USAGE.md file in the Spike-STF repo for
406407
instructions on how to use initd to automate linux based trace generation.
407408

408-
See [Automating Linux Tracing with INIT.d](https://github.com/jeffnye-gh/cpm.riscv-isa-sim/blob/spike_stf/USAGE.md#Automating-linux-tracing-with-initd)
409+
See [Automating Linux Tracing with INIT.d](https://github.com/condorcomputing/condor.riscv-isa-sim/blob/spike_stf/USAGE.md#automating-linux-tracing-with-initd)
409410

410411

411412
-----------------------------------------------------

0 commit comments

Comments
 (0)