Commit Graph

106 Commits

Author SHA1 Message Date
Franz Fuchs
4c194d4e82 integrated new version of RISCV_HPM_Events done by Jess 2021-09-23 14:36:50 +01:00
Franz Fuchs
9320e53720 Bumped RISCV_HPM_Events made minor changes 2021-09-17 10:38:48 +01:00
Franz Fuchs
e675400ab8 Fixed things as pointed out by aj443 2021-09-13 16:35:23 +01:00
Franz Fuchs
4c9d89e936 Performed a bit of cleaning up 2021-09-06 13:33:13 +01:00
Franz Fuchs
0d42b6075a Bump new HPM Events submodule 2021-09-06 13:10:38 +01:00
Franz Fuchs
83172e612c Added makefile support for HPM events files 2021-09-06 12:44:29 +01:00
Franz Fuchs
e33b4021d8 Integrated generateHPMVector function 2021-09-03 17:37:43 +01:00
Franz Fuchs
9f615e4481 initial changes for HPM consistency 2021-09-02 14:50:17 +01:00
Peter Rugg
ae4a16cd6b Fix build issues for RVFI_DII simulators 2021-07-13 14:52:08 +01:00
Peter Rugg
cb4b67ff7d Enable TSO_MM for simulations 2021-07-12 15:50:54 +01:00
Peter Rugg
a8c4ce073d Factor out bsc flags to include_common 2021-07-12 15:50:54 +01:00
Franz Fuchs
4ba377366a Introduced new build flag for transient-execution testing contracts 2021-07-08 15:28:54 +01:00
Marno
c38f0e8488 Using new tagparams.py that explicitly warns about overlapping tag and data memory regions 2021-03-19 11:22:40 +00:00
Marno van der Maas
5d7b224d8b Added TagTableStructure.bsv as dependency for .depends.mk in verilator build as well 2021-03-18 11:36:46 +00:00
Peter Rugg
057964e940 Some more tagsparam makefile fixes 2021-03-18 11:09:26 +00:00
Marno
e759077259 Made sure TagTableStructure.bsv is present upon regenration of .depends.mk 2021-03-18 10:47:15 +00:00
Marno
e7d0a6adf6 Removing TagTableStructure.bsv and .depends.mk on clean 2021-03-17 16:53:03 +00:00
Marno
df6cc12abb Removed TagTableStructure.bsv files from repo because these are now automatically generated 2021-03-17 16:01:16 +00:00
Marno
db57e909fc Added calling tagsparams.py in Include_Common.mk 2021-03-17 15:56:03 +00:00
Franz Fuchs
c5a0d38a63 Enabled HPM by default in builds/RV64ACDFIMSUxCHERI_Toooba_verilator/ 2021-03-16 13:19:47 +00:00
Jessica Clarke
d722d851d9 verilator_config.vlt: Hopefully suppress deprecation warnings for 4.026 2021-03-11 14:11:38 +00:00
Jessica Clarke
9dc27542f3 Use order-only prerequisites for directories
Hopefully this stops .depends.mk from being generated more than
necessary, as presumably the fact that compile and simulator both add
new files to build_dir (and Verilog_RTL for Verilator) causes the
timestamp to change and thus make to think .depends.mk is stale.
2021-02-28 04:14:54 +00:00
Peter Rugg
f800cdeb77 Prevent spurious warnings 2021-01-30 15:21:38 +00:00
jon
259d34618c A design that actually passes one performance monitor trace from
TestRig.  The example counted redirections, which happend to match
between Flute and Toooba for this example.
2020-12-01 18:02:11 +00:00
Jessica Clarke
eeb6c91b9d Don't use -D_GLIBCXX_USE_CXX11_ABI=0 for bluesim builds
Same problem as Piccolo/Flute, and this was a terrible workaround on
Bluespec's part.
2020-07-12 21:32:29 +01:00
Jessica Clarke
c66d0183b5 Fix missing serv_socket_init at run time for bluesim RVFI-DII build 2020-07-12 21:28:46 +01:00
Peter Rugg
627c60b4e3 Don't generate .depends.mk if bluespec doesn't parse 2020-07-09 15:21:19 +01:00
Jessica Clarke
17ed2dfde8 Revert CACHE_SIZE back to LARGE
The default was erroneously changed, causing P3 builds to have smaller
caches, so switch it back. The RVFI-DII builds override this with a TEST
configuration anyway now.
2020-07-05 21:44:17 +01:00
Jessica Clarke
7b1259b41b Add a Bluesim RVFI-DII config 2020-07-05 21:43:21 +01:00
Jessica Clarke
badf5c8e37 Include xCHERI in ARCH and build directory names
Also use RVFI_DII not RVFIDII in the directory names.

This makes everything match Piccolo/Flute rather than having Toooba be a
weird, inconsistent and plain wrong.
2020-07-05 21:41:28 +01:00
Jessica Clarke
46ae8ea159 Port parallel build support to bluesim 2020-07-05 21:31:44 +01:00
Jessica Clarke
106f70e42b Fix Bluesim build (synced from Verilator Makefile) 2020-07-05 21:28:19 +01:00
Jessica Clarke
027b769904 Reduce diff to upstream 2020-07-05 21:28:12 +01:00
Jessica Clarke
0b0b863baa Replace home-grown dependency script with Bluespec-provided makedepend.tcl
This one has the advantage of being able to be called with the same
flags as bsc, rather than needing to pass things through special
environment variables. As a result, revert all our changes to dealing
with BSC_COMPILATION_FLAGS (some of this diff therefore looks strangely
formatted, but it's to match upstream verbatim, and should be left that
way to minimise diffs and avoid conflicts).
2020-07-05 21:26:18 +01:00
Peter Rugg
8778369fe5 Merge remote-tracking branch 'upstream/master' into CHERI 2020-06-17 13:01:41 +01:00
jon
dcfdb34f0a Changes to build with the now more parameterisable TagController. 2020-06-15 16:46:15 +01:00
jon
f582d6550b Add BLUESIM to two simulation builds as the TagController expects this
variable to be set when building for simulation.
2020-06-11 09:43:38 +01:00
jon
8ae5d3a1b2 Build RVFI_DII Toooba with very small caches, 2-way set associative to
maximise cache and memory verification.
2020-05-28 10:59:08 +01:00
jon
0f0d1a983b Remove references to ScrFile which were mysteriously still here. 2020-05-12 17:24:50 +01:00
Alexandre Joannou
1a3915d8a2 Fix display message when running the dependency script 2020-04-27 15:27:16 +01:00
Alexandre Joannou
dfde021eb6 Avoid creation of outputfile on failure of dependency script + add beri license header 2020-04-24 15:09:04 +01:00
Alexandre Joannou
370ed61bc4 Integrate the generation of dependenices to Makefiles 2020-04-23 14:55:28 +01:00
jon
92e3216c69 Don't use special recursive build for the top level, as this just rebuilds everything. 2020-04-23 10:42:45 +01:00
Alexandre Joannou
aa79240629 generalise genDependencies a bit with env variables (no obvious getoptsin tcl AFAIK) 2020-04-23 02:04:19 +01:00
jon
f6b7132d4f Makefile updates to do a parallel build, including the tcl script to generate a dependency graph using the Bluespec compiler (which was written by Alexandre). 2020-04-22 22:44:19 +01:00
Jessica Clarke
3add2cac5e Move MakeReset0.v to src_bsc_lib_RTL like Piccolo and Flute
This ensures it's shared across all simulator builds.
2020-04-16 17:19:16 +01:00
Jessica Clarke
a2aee1969d verilator_config.vlt: Revert "fix"
lint_off -rule is a very new feature that requires Verilator v4.026
released in Jan 2020, and is thus not in Ubuntu 18.04. Any breakage with
newer versions should be fixed in some other backwards-compatible way.
2020-04-16 17:12:27 +01:00
Rishiyur S. Nikhil
7accf2c1a0 Merge pull request #11 from CTSRD-CHERI/mac_build
Resolve some issues to build on mac.
2020-04-07 09:13:19 -04:00
Peter Rugg
ae78cd3d6a Don't track built files 2020-04-07 13:56:34 +01:00
Jonathan Woodruff
dbcc4a6c22 Re-add dummy Mem.hex file. 2020-03-30 15:18:01 +01:00