Skip to content

Commit 1c98d6a

Browse files
davidharrishmcdavidharrishmc
authored
Renamed imperasfpm to imperas (#1114)
1 parent 546a58c commit 1c98d6a

39 files changed

Lines changed: 51 additions & 55 deletions

‎Makefile‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,32 +92,28 @@ qemu-rv64: CONFIG_FILES = config/qemu/qemu-rv64-max/test_config.yaml
9292
qemu-rv64: elfs
9393
./run_tests.py "$(QEMU_RV64_CMD)" $(WORKDIR)/qemu-rv64-max/elfs
9494

95-
##### ImperasFPM test targets #####
96-
.PHONY: imperasfpm imperasfpm-rv32 imperasfpm-rv64
95+
##### imperas test targets #####
96+
.PHONY: imperas imperas-rv32 imperas-rv64
9797

98-
# Add --trace before --program to see a trace of the executed instructions for debug
99-
IMPERASFPM_RV32_MAX_CMD := IMPERAS_TOOLS=config/imperasfpm/imperasfpm-rv32-max/imperas.ic iss.exe --verbose --program
100-
IMPERASFPM_RV64_MAX_CMD := IMPERAS_TOOLS=config/imperasfpm/imperasfpm-rv64-max/imperas.ic iss.exe --verbose --program
101-
IMPERASFPM_RVI20U32_CMD := IMPERAS_TOOLS=config/imperasfpm/imperasfpm-RVI20U32/imperas.ic iss.exe --verbose --program
102-
IMPERASFPM_RVI20U64_CMD := IMPERAS_TOOLS=config/imperasfpm/imperasfpm-RVI20U64/imperas.ic iss.exe --verbose --program
98+
# Add --trace --tracechange --traceshowicount before --program to see a trace of the executed instructions for debug
99+
IMPERAS_RV32_MAX_CMD := IMPERAS_TOOLS=config/imperas/imperas-rv32-max/imperas.ic iss.exe --verbose --program
100+
IMPERAS_RV64_MAX_CMD := IMPERAS_TOOLS=config/imperas/imperas-rv64-max/imperas.ic iss.exe --verbose --program
103101

104-
imperasfpm: CONFIG_FILES = config/imperasfpm/imperasfpm-rv32-max/test_config.yaml config/imperasfpm/imperasfpm-rv64-max/test_config.yaml config/imperasfpm/imperasfpm-RVI20U64/test_config.yaml config/imperasfpm/imperasfpm-RVI20U32/test_config.yaml
105-
imperasfpm: elfs
102+
imperas: CONFIG_FILES = config/imperas/imperas-rv32-max/test_config.yaml config/imperas/imperas-rv64-max/test_config.yaml
103+
imperas: elfs
106104
@exit_code=0; \
107-
./run_tests.py "$(IMPERASFPM_RV64_MAX_CMD)" $(WORKDIR)/imperasfpm-rv64-max/elfs || exit_code=1; \
108-
./run_tests.py "$(IMPERASFPM_RV32_MAX_CMD)" $(WORKDIR)/imperasfpm-rv32-max/elfs || exit_code=1; \
109-
./run_tests.py "$(IMPERASFPM_RVI20U64_CMD)" $(WORKDIR)/imperasfpm-RVI20U64/elfs || exit_code=1; \
110-
./run_tests.py "$(IMPERASFPM_RVI20U32_CMD)" $(WORKDIR)/imperasfpm-RVI20U32/elfs || exit_code=1; \
105+
./run_tests.py "$(IMPERAS_RV64_MAX_CMD)" $(WORKDIR)/imperas-rv64-max/elfs || exit_code=1; \
106+
./run_tests.py "$(IMPERAS_RV32_MAX_CMD)" $(WORKDIR)/imperas-rv32-max/elfs || exit_code=1; \
111107
exit $$exit_code
112108

113109
# Add --verbose to run_tests.py arguments to see the simulator commands
114-
imperasfpm-rv32: CONFIG_FILES = config/imperasfpm/imperasfpm-rv32-max/test_config.yaml
115-
imperasfpm-rv32: elfs
116-
./run_tests.py "$(IMPERASFPM_RV32_MAX_CMD)" $(WORKDIR)/imperasfpm-rv32-max/elfs
110+
imperas-rv32: CONFIG_FILES = config/imperas/imperas-rv32-max/test_config.yaml
111+
imperas-rv32: elfs
112+
./run_tests.py "$(IMPERAS_RV32_MAX_CMD)" $(WORKDIR)/imperas-rv32-max/elfs
117113

118-
imperasfpm-rv64: CONFIG_FILES = config/imperasfpm/imperasfpm-rv64-max/test_config.yaml
119-
imperasfpm-rv64: elfs
120-
./run_tests.py "$(IMPERASFPM_RV64_MAX_CMD)" $(WORKDIR)/imperasfpm-rv64-max/elfs
114+
imperas-rv64: CONFIG_FILES = config/imperas/imperas-rv64-max/test_config.yaml
115+
imperas-rv64: elfs
116+
./run_tests.py "$(IMPERAS_RV64_MAX_CMD)" $(WORKDIR)/imperas-rv64-max/elfs
121117

122118

123119

config/imperasfpm/imperasfpm-RVI20U32/imperasfpm-RVI20U32.yaml renamed to config/imperas/imperas-RVI20U32/imperas-RVI20U32.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$schema: config_schema.json#
44
kind: architecture configuration
55
type: fully configured
6-
name: imperasfpm-RVI20U32
6+
name: imperas-RVI20U32
77
description: RVI20U32 with all optional extensions
88
implemented_extensions:
99
- { name: I, version: "= 2.1" }

config/imperasfpm/imperasfpm-RVI20U32/imperas.ic renamed to config/imperas/imperas-RVI20U32/imperas.ic

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# imperas.ic
2-
# Initialization file for rv32gc ImperasDV lock step simulation
3-
# David_Harris@hmc.edu 15 August 2024
4-
# jcarlin@hmc.edu 19 March 2025
2+
# Initialization file for Imperas ISS
3+
# David_Harris@hmc.edu 23 March 2026
54
# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
65

76
# Base configuration

‎config/imperas/imperas-RVI20U32/link.ld‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../imperas-rv64-max/link.ld

‎config/imperas/imperas-RVI20U32/rvmodel_macros.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../imperas-rv64-max/rvmodel_macros.h

config/imperasfpm/imperasfpm-RVI20U32/rvtest_config.h renamed to config/imperas/imperas-RVI20U32/rvtest_config.h

File renamed without changes.

config/imperasfpm/imperasfpm-RVI20U32/rvtest_config.svh renamed to config/imperas/imperas-RVI20U32/rvtest_config.svh

File renamed without changes.

config/imperasfpm/imperasfpm-RVI20U32/sail.json renamed to config/imperas/imperas-RVI20U32/sail.json

File renamed without changes.

config/imperasfpm/imperasfpm-RVI20U32/test_config.yaml renamed to config/imperas/imperas-RVI20U32/test_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name: imperasfpm-RVI20U32
1+
name: imperas-RVI20U32
22
compiler_exe: riscv64-unknown-elf-gcc # executable name on $PATH or full path to executable
33
objdump_exe: riscv64-unknown-elf-objdump # executable name on $PATH or full path to executable, optional
44
ref_model_exe: sail_riscv_sim # executable name on $PATH or full path to executable
5-
udb_config: imperasfpm-RVI20U32.yaml
5+
udb_config: imperas-RVI20U32.yaml
66
linker_script: link.ld
77
dut_include_dir: . # Directory containing DUT specific rvmodel_macros.h header

config/imperasfpm/imperasfpm-RVI20U64/imperasfpm-RVI20U64.yaml renamed to config/imperas/imperas-RVI20U64/imperas-RVI20U64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$schema: config_schema.json#
44
kind: architecture configuration
55
type: fully configured
6-
name: imperasfpm-RVI20U64
6+
name: imperas-RVI20U64
77
description: RVI20U64 with all optional extensions
88
implemented_extensions:
99
- { name: I, version: "= 2.1" }

0 commit comments

Comments
 (0)