Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardise on using underscores in directory names in makefiles.

Browse Source
This commit is contained in:
Jonathan Woodruff
2024-05-17 11:21:42 +01:00
parent 2c648eb1ed
commit 1b9d498e95
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builds/Resources/Include_Common.mk
View File

@@ -56,7 +56,6 @@ BSC_COMPILATION_FLAGS += \
-D BLUESIM \ -D BLUESIM \
-D PERFORMANCE_MONITORING \ -D PERFORMANCE_MONITORING \
-D RAS_HIT_TRACING \ -D RAS_HIT_TRACING \
-D NO_SPEC_TRAINING -D NO_SPEC_REDIRECT -D NO_SPEC_STRAIGHT_PATH -D SPEC_RSB_FIXUP -D MELTDOWN_CF \
-keep-fires -aggressive-conditions -no-warn-action-shadowing -check-assert \ -keep-fires -aggressive-conditions -no-warn-action-shadowing -check-assert \
-suppress-warnings G0020 -steps-max-intervals 10000000 \ -suppress-warnings G0020 -steps-max-intervals 10000000 \
-steps-warn-interval 1000000 \ -steps-warn-interval 1000000 \
@@ -113,17 +112,17 @@ TagTableStructure.bsv: $(REPO)/libs/TagController/tagsparams.py
.PHONY: generate_hpm_vector .PHONY: generate_hpm_vector
generate_hpm_vector: GenerateHPMVector.bsv generate_hpm_vector: GenerateHPMVector.bsv
GenerateHPMVector.bsv: $(RISCVHPMEVENTSDIR)/parse_counters.py GenerateHPMVector.bsv: $(RISCV_HPM_EVENTS_DIR)/parse_counters.py
@echo "INFO: Re-generating GenerateHPMVector bluespec file" @echo "INFO: Re-generating GenerateHPMVector bluespec file"
$^ $(RISCVHPMEVENTSDIR)/counters.yaml -m ProcTypes -b $@ $^ $(RISCV_HPM_EVENTS_DIR)/counters.yaml -m ProcTypes -b $@
@echo "INFO: Re-generated GenerateHPMVector bluespec file" @echo "INFO: Re-generated GenerateHPMVector bluespec file"
.PHONY: stat_counters .PHONY: stat_counters
stat_counters: StatCounters.bsv stat_counters: StatCounters.bsv
StatCounters.bsv: $(RISCVHPMEVENTSDIR)/parse_counters.py StatCounters.bsv: $(RISCV_HPM_EVENTS_DIR)/parse_counters.py
@echo "INFO: Re-generating HPM events struct bluepsec file" @echo "INFO: Re-generating HPM events struct bluepsec file"
$^ $(RISCVHPMEVENTSDIR)/counters.yaml -m ProcTypes -s $@ $^ $(RISCV_HPM_EVENTS_DIR)/counters.yaml -m ProcTypes -s $@
@echo "INFO: Re-generated HPM events struct bluespec file" @echo "INFO: Re-generated HPM events struct bluespec file"
compile: tagsparams #stat_counters generate_hpm_vector compile: tagsparams #stat_counters generate_hpm_vector

20
builds/Resources/Include_RISCY_Config.mk
View File

@@ -107,6 +107,7 @@ BSC_COMPILATION_FLAGS += \
-D ISA_PRIV_M -D ISA_PRIV_S -D ISA_PRIV_U \ -D ISA_PRIV_M -D ISA_PRIV_S -D ISA_PRIV_U \
-D SV39 \ -D SV39 \
-D ISA_I -D ISA_M -D ISA_A -D ISA_F -D ISA_D -D ISA_FD_DIV -D ISA_C \ -D ISA_I -D ISA_M -D ISA_A -D ISA_F -D ISA_D -D ISA_FD_DIV -D ISA_C \
-D NO_SPEC_TRAINING -D NO_SPEC_REDIRECT -D NO_SPEC_STRAIGHT_PATH -D SPEC_RSB_FIXUP -D MELTDOWN_CF \
-D CheriBusBytes=64 \ -D CheriBusBytes=64 \
-D CheriMasterIDWidth=1 \ -D CheriMasterIDWidth=1 \
-D CheriTransactionIDWidth=6 -D CheriTransactionIDWidth=6
@@ -118,6 +119,7 @@ BSC_COMPILATION_FLAGS += \
# -D NO_LOAD_RESP_E # -D NO_LOAD_RESP_E
# various SECURITY related flags # various SECURITY related flags
# -D PERF_COUNT -D CHECK_DEADLOCK -D RENAME_DEBUG ... # -D PERF_COUNT -D CHECK_DEADLOCK -D RENAME_DEBUG ...
# -D NO_SPEC_RSB_PUSH -D NO_SPEC_STL -D RVFI
# +RTS -K1G -RTS " --bscflags=" -steps-max-intervals 200 -check-assert # +RTS -K1G -RTS " --bscflags=" -steps-max-intervals 200 -check-assert
@@ -125,14 +127,14 @@ BSC_COMPILATION_FLAGS += \
# ================================================================ # ================================================================
# Search path for bsc for .bsv files # Search path for bsc for .bsv files
COREDIR ?= $(REPO) CORE_DIR ?= $(REPO)
COREW_DIRS = $(COREDIR)/src_Core/Core:$(COREDIR)/src_Core/CPU:$(COREDIR)/src_Core/ISA:$(COREDIR)/src_Core/PLIC:$(COREDIR)/src_Core/Debug_Module:$(COREDIR)/src_Core/BSV_Additional_Libs:$(COREDIR)/src_Core/RISCY_OOO/procs/RV64G_OOO:$(COREDIR)/src_Core/RISCY_OOO/procs/lib:$(COREDIR)/src_Core/RISCY_OOO/coherence/src:$(COREDIR)/src_Core/RISCY_OOO/fpgautils/lib COREW_DIRS = $(CORE_DIR)/src_Core/Core:$(CORE_DIR)/src_Core/CPU:$(CORE_DIR)/src_Core/ISA:$(CORE_DIR)/src_Core/PLIC:$(CORE_DIR)/src_Core/Debug_Module:$(CORE_DIR)/src_Core/BSV_Additional_Libs:$(CORE_DIR)/src_Core/RISCY_OOO/procs/RV64G_OOO:$(CORE_DIR)/src_Core/RISCY_OOO/procs/lib:$(CORE_DIR)/src_Core/RISCY_OOO/coherence/src:$(CORE_DIR)/src_Core/RISCY_OOO/fpgautils/lib
WINDCOREIFCDIR ?= $(COREDIR)/libs/WindCoreInterface WINDCORE_IFC_DIR ?= $(CORE_DIR)/libs/WindCoreInterface
CHERICAPLIBDIR ?= $(COREDIR)/libs/cheri-cap-lib CHERICAPLIB_DIR ?= $(CORE_DIR)/libs/cheri-cap-lib
TAGCONTROLLERDIR ?= $(COREDIR)/libs/TagController TAG_CONTROLLER_DIR ?= $(CORE_DIR)/libs/TagController
RISCVHPMEVENTSDIR ?= $(COREDIR)/libs/RISCV_HPM_Events RISCV_HPM_EVENTS_DIR ?= $(CORE_DIR)/libs/RISCV_HPM_Events
TAGCONTROLLER_DIRS = $(TAGCONTROLLERDIR)/TagController:$(TAGCONTROLLERDIR)/TagController/CacheCore TAG_CONTROLLER_DIRS = $(TAG_CONTROLLER_DIR)/TagController:$(TAG_CONTROLLER_DIR)/TagController/CacheCore
BLUESTUFFDIR ?= $(COREDIR)/libs/BlueStuff BLUESTUFFDIR ?= $(CORE_DIR)/libs/BlueStuff
include $(BLUESTUFFDIR)/bluestuff.inc.mk # sets the BLUESTUFF_DIRS variable include $(BLUESTUFFDIR)/bluestuff.inc.mk # sets the BLUESTUFF_DIRS variable
# search path for bsc imports # search path for bsc imports
@@ -143,5 +145,5 @@ BSC_CONTRIB_LIB_DIR = %/Libraries
endif endif
BSC_CONTRIB_DIRS = $(BSC_CONTRIB_LIB_DIR)/Bus BSC_CONTRIB_DIRS = $(BSC_CONTRIB_LIB_DIR)/Bus
BSVPATH = +:$(BSC_CONTRIB_DIRS):$(WINDCOREIFCDIR):$(RISCVHPMEVENTSDIR):$(CHERICAPLIBDIR):$(TAGCONTROLLER_DIRS):$(COREW_DIRS):$(BLUESTUFF_DIRS) BSVPATH = +:$(BSC_CONTRIB_DIRS):$(WINDCORE_IFC_DIR):$(RISCV_HPM_EVENTS_DIR):$(CHERICAPLIB_DIR):$(TAG_CONTROLLER_DIRS):$(COREW_DIRS):$(BLUESTUFF_DIRS)
BSC_PATH = -p $(BSVPATH) BSC_PATH = -p $(BSVPATH)

8
src_SSITH_P3/Makefile
View File

@@ -78,17 +78,17 @@ src_BSV/TagTableStructure.bsv: $(REPO)/libs/TagController/tagsparams.py
.PHONY: generate_hpm_vector .PHONY: generate_hpm_vector
generate_hpm_vector: GenerateHPMVector.bsv generate_hpm_vector: GenerateHPMVector.bsv
GenerateHPMVector.bsv: $(RISCVHPMEVENTSDIR)/parse_counters.py GenerateHPMVector.bsv: $(RISCV_HPM_EVENTS_DIR)/parse_counters.py
@echo "INFO: Re-generating GenerateHPMVector bluespec file" @echo "INFO: Re-generating GenerateHPMVector bluespec file"
$^ $(RISCVHPMEVENTSDIR)/counters.yaml -m ProcTypes -b $@ $^ $(RISCV_HPM_EVENTS_DIR)/counters.yaml -m ProcTypes -b $@
@echo "INFO: Re-generated GenerateHPMVector bluespec file" @echo "INFO: Re-generated GenerateHPMVector bluespec file"
.PHONY: stat_counters .PHONY: stat_counters
stat_counters: StatCounters.bsv stat_counters: StatCounters.bsv
StatCounters.bsv: $(RISCVHPMEVENTSDIR)/parse_counters.py StatCounters.bsv: $(RISCV_HPM_EVENTS_DIR)/parse_counters.py
@echo "INFO: Re-generating HPM events struct bluepsec file" @echo "INFO: Re-generating HPM events struct bluepsec file"
$^ $(RISCVHPMEVENTSDIR)/counters.yaml -m ProcTypes -s $@ $^ $(RISCV_HPM_EVENTS_DIR)/counters.yaml -m ProcTypes -s $@
@echo "INFO: Re-generated HPM events struct bluespec file" @echo "INFO: Re-generated HPM events struct bluespec file"
compile_sim: tagsparams stat_counters generate_hpm_vector compile_sim: tagsparams stat_counters generate_hpm_vector
compile_synth: tagsparams stat_counters generate_hpm_vector compile_synth: tagsparams stat_counters generate_hpm_vector