From a494f88af0acb161a3523ff8597ed914e2a47218 Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Sun, 25 Aug 2019 08:22:41 -0700 Subject: [PATCH 1/6] Add sha3 repo and config, bump tools for xcustom fix --- .gitmodules | 3 +++ build.sbt | 6 +++++- generators/example/src/main/scala/Configs.scala | 4 ++++ generators/rocc-template | 1 + toolchains/esp-tools | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) create mode 160000 generators/rocc-template diff --git a/.gitmodules b/.gitmodules index 26846989..fc31b672 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "tools/treadle"] path = tools/treadle url = https://github.com/freechipsproject/treadle.git +[submodule "generators/rocc-template"] + path = generators/rocc-template + url = https://github.com/ucb-bar/rocc-template.git diff --git a/build.sbt b/build.sbt index c5562c45..9f33da3d 100644 --- a/build.sbt +++ b/build.sbt @@ -106,7 +106,7 @@ lazy val testchipip = (project in file("generators/testchipip")) .settings(commonSettings) lazy val example = conditionalDependsOn(project in file("generators/example")) - .dependsOn(boom, hwacha, sifive_blocks, sifive_cache) + .dependsOn(boom, hwacha, sifive_blocks, sifive_cache, rocc_template) .settings(commonSettings) lazy val utilities = conditionalDependsOn(project in file("generators/utilities")) @@ -124,6 +124,10 @@ lazy val boom = (project in file("generators/boom")) .dependsOn(rocketchip) .settings(commonSettings) +lazy val rocc_template = (project in file("generators/rocc-template")) + .dependsOn(rocketchip, `chisel-testers`) + .settings(commonSettings) + lazy val tapeout = conditionalDependsOn(project in file("./tools/barstools/tapeout/")) .settings(commonSettings) diff --git a/generators/example/src/main/scala/Configs.scala b/generators/example/src/main/scala/Configs.scala index c7e70dd2..098b4e16 100644 --- a/generators/example/src/main/scala/Configs.scala +++ b/generators/example/src/main/scala/Configs.scala @@ -27,6 +27,10 @@ class RoccRocketConfig extends Config( new WithRoccExample ++ new DefaultRocketConfig) +class Sha3RocketConfig extends Config( + new sha3.WithSha3Accel ++ + new DefaultRocketConfig) + class PWMRocketConfig extends Config( new WithPWMBoomRocketTop ++ new BaseRocketConfig) diff --git a/generators/rocc-template b/generators/rocc-template new file mode 160000 index 00000000..fa165f8a --- /dev/null +++ b/generators/rocc-template @@ -0,0 +1 @@ +Subproject commit fa165f8a54c492cacd794964120b56d48d2fe7b2 diff --git a/toolchains/esp-tools b/toolchains/esp-tools index aba7bd82..f13ae53f 160000 --- a/toolchains/esp-tools +++ b/toolchains/esp-tools @@ -1 +1 @@ -Subproject commit aba7bd828d4fd1c5fc3ac227524ccfd350410ade +Subproject commit f13ae53fcd09c1119a1697df37335718904fc7be From b0743538f31f34667c39c45b6771913c3e38566b Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Sun, 25 Aug 2019 09:00:42 -0700 Subject: [PATCH 2/6] bump rocc-template for chisel fixes --- generators/rocc-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/rocc-template b/generators/rocc-template index fa165f8a..3e4f9fa7 160000 --- a/generators/rocc-template +++ b/generators/rocc-template @@ -1 +1 @@ -Subproject commit fa165f8a54c492cacd794964120b56d48d2fe7b2 +Subproject commit 3e4f9fa768f4524edc01439a3453f985325f45c6 From 36b25bbd09dbc2eb73973118160e8f25f6123a99 Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Sun, 25 Aug 2019 09:09:03 -0700 Subject: [PATCH 3/6] bump rocc-template so it builds again --- generators/rocc-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/rocc-template b/generators/rocc-template index 3e4f9fa7..4882648c 160000 --- a/generators/rocc-template +++ b/generators/rocc-template @@ -1 +1 @@ -Subproject commit 3e4f9fa768f4524edc01439a3453f985325f45c6 +Subproject commit 4882648c653df0dc6d365d5a5c677c13952541aa From 208a27da7948fbf33236c90225f772a9585fe30b Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Mon, 26 Aug 2019 10:43:43 -0700 Subject: [PATCH 4/6] bump sha3 and tools for xs setup --- generators/rocc-template | 2 +- toolchains/esp-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/rocc-template b/generators/rocc-template index 4882648c..83dd1955 160000 --- a/generators/rocc-template +++ b/generators/rocc-template @@ -1 +1 @@ -Subproject commit 4882648c653df0dc6d365d5a5c677c13952541aa +Subproject commit 83dd1955a9a6f277addfbcc65394986e73fc03b2 diff --git a/toolchains/esp-tools b/toolchains/esp-tools index f13ae53f..dcb6012f 160000 --- a/toolchains/esp-tools +++ b/toolchains/esp-tools @@ -1 +1 @@ -Subproject commit f13ae53fcd09c1119a1697df37335718904fc7be +Subproject commit dcb6012f77101e793948cc90ac31b3735a9f3f6d From 8d9b3ddfb2c80e1914e956b43d40fa0733966832 Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Mon, 26 Aug 2019 12:36:50 -0700 Subject: [PATCH 5/6] Change spaces to underscores in sim_out_name This fixes #209 --- variables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index ca0f8fc9..41d5ef81 100644 --- a/variables.mk +++ b/variables.mk @@ -143,7 +143,7 @@ output_dir=$(sim_dir)/output/$(long_name) BINARY ?= SIM_FLAGS ?= VERBOSE_FLAGS ?= +verbose -sim_out_name = $(notdir $(basename $(BINARY))).$(long_name) +sim_out_name = $(subst $() $(),_,$(notdir $(basename $(BINARY))).$(long_name)) ######################################################################################### # build output directory for compilation From 8e343dee046e16813e5c267b7b6154e64628b9fb Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Sun, 1 Sep 2019 07:11:52 -0700 Subject: [PATCH 6/6] Fix sha3 build-system dependency --- .gitmodules | 2 +- common.mk | 2 +- generators/{rocc-template => sha3} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename generators/{rocc-template => sha3} (100%) diff --git a/.gitmodules b/.gitmodules index fc31b672..cad55a67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,5 +56,5 @@ path = tools/treadle url = https://github.com/freechipsproject/treadle.git [submodule "generators/rocc-template"] - path = generators/rocc-template + path = generators/sha3 url = https://github.com/ucb-bar/rocc-template.git diff --git a/common.mk b/common.mk index 3c333c68..103e5407 100644 --- a/common.mk +++ b/common.mk @@ -8,7 +8,7 @@ SHELL=/bin/bash ######################################################################################### lookup_scala_srcs = $(shell find -L $(1)/ -iname "*.scala" 2> /dev/null) -PACKAGES=$(addprefix generators/, rocket-chip testchipip boom hwacha sifive-blocks sifive-cache example) \ +PACKAGES=$(addprefix generators/, rocket-chip testchipip boom hwacha sifive-blocks sifive-cache rocc-template example) \ $(addprefix sims/firesim/sim/, . firesim-lib midas midas/targetutils) SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/$(pkg)/src/main/scala)) diff --git a/generators/rocc-template b/generators/sha3 similarity index 100% rename from generators/rocc-template rename to generators/sha3