From 6ca1715b47a315777f2c11a33035f03c0af32309 Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Tue, 12 Nov 2019 17:18:02 -0500 Subject: [PATCH 1/4] Bump firemarshal to not initialize linux by default. This bumps the sha3 generator to include the software workloads (moved from marshal). As a result, the sha3 generator submodule is not initialized by default (because it now has a copy of linux). --- generators/sha3 | 2 +- scripts/init-submodules-no-riscv-tools.sh | 5 +++++ sims/firesim | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/generators/sha3 b/generators/sha3 index 60ddfe7c..e3ff7593 160000 --- a/generators/sha3 +++ b/generators/sha3 @@ -1 +1 @@ -Subproject commit 60ddfe7c5b2c1640d91e7d9a35c65011c1600810 +Subproject commit e3ff75939d7f234a626eea641598e223f83ecb19 diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh index d8842050..faa78bb6 100755 --- a/scripts/init-submodules-no-riscv-tools.sh +++ b/scripts/init-submodules-no-riscv-tools.sh @@ -32,6 +32,9 @@ for name in toolchains/*/*/ ; do done git config submodule.toolchains/qemu.update none +# Don't automatically initialize generators with big submodules (e.g. linux source) +git config submodule.generators/sha3.update none + # Disable updates to the FireSim submodule until explicitly requested git config submodule.sims/firesim.update none # Disable updates to the hammer tool plugins repos @@ -49,6 +52,8 @@ git config --unset submodule.vlsi/hammer-cadence-plugins.update git config --unset submodule.vlsi/hammer-synopsys-plugins.update git config --unset submodule.vlsi/hammer-mentor-plugins.update +git config --unset submodule.generators/sha3.update + if [ $NO_FIRESIM = false ]; then echo "initializing firesim" # Renable firesim and init only the required submodules to provide diff --git a/sims/firesim b/sims/firesim index afad1b6a..e57b4ede 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit afad1b6accfaba5efbc0cfeea66372abae5ab2eb +Subproject commit e57b4ede73d53d13cc5e7d60138a593f55a64c3b From 6d2f102a7e121f57d09cf30117527c5304c8d733 Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Tue, 12 Nov 2019 19:42:36 -0500 Subject: [PATCH 2/4] Shallow clone sha3 --- generators/sha3 | 2 +- scripts/init-submodules-no-riscv-tools.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/generators/sha3 b/generators/sha3 index e3ff7593..e27d808c 160000 --- a/generators/sha3 +++ b/generators/sha3 @@ -1 +1 @@ -Subproject commit e3ff75939d7f234a626eea641598e223f83ecb19 +Subproject commit e27d808cf1a637a8f2a80fc5dcde44c3d0a41c5c diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh index faa78bb6..c61f8b3e 100755 --- a/scripts/init-submodules-no-riscv-tools.sh +++ b/scripts/init-submodules-no-riscv-tools.sh @@ -53,6 +53,8 @@ git config --unset submodule.vlsi/hammer-synopsys-plugins.update git config --unset submodule.vlsi/hammer-mentor-plugins.update git config --unset submodule.generators/sha3.update +# Shallow clone by default (recursive clone would get linux) +git submodule update --init generators/sha3 if [ $NO_FIRESIM = false ]; then echo "initializing firesim" From 06216db269796964c197263b9a0f3383a11b70ec Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Wed, 13 Nov 2019 14:52:31 -0500 Subject: [PATCH 3/4] Bump firesim --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index e57b4ede..71e18b39 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit e57b4ede73d53d13cc5e7d60138a593f55a64c3b +Subproject commit 71e18b39884c42bc6ab4d7b5f918384c3e5890f9 From 126efe7594e8674343bfb83f2f03a4dfb2870887 Mon Sep 17 00:00:00 2001 From: Nathan Pemberton Date: Wed, 13 Nov 2019 19:34:02 -0500 Subject: [PATCH 4/4] Final firesim bump (to dev) --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index 71e18b39..cfeb0e67 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 71e18b39884c42bc6ab4d7b5f918384c3e5890f9 +Subproject commit cfeb0e67fe58f896b95459e110802903fed5145a