From d71c3b6357597da5aca589ee0dda1b7e5f4fe79a Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 2 Oct 2020 11:22:55 -0700 Subject: [PATCH 1/3] Unify htif implementation with firesim --- generators/testchipip | 2 +- sims/firesim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/testchipip b/generators/testchipip index b3aa1bea..9cf31ace 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit b3aa1bea536ee96a1e69796d35f7651a314c2f6a +Subproject commit 9cf31acea528543896f04457573454a3e51f1e6a diff --git a/sims/firesim b/sims/firesim index ef615d35..dd20a99f 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit ef615d35da118e73f5128d373f17b80884100773 +Subproject commit dd20a99f33eba31ffa2d6c7e9fc914445224d4e9 From 25129c27ca20870518161228723e6d55fb31f9de Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 2 Oct 2020 13:07:42 -0700 Subject: [PATCH 2/3] Add testchip_fesvr to uncondtionally used resources --- generators/utilities/src/main/scala/Simulator.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generators/utilities/src/main/scala/Simulator.scala b/generators/utilities/src/main/scala/Simulator.scala index b2982db7..02224fdb 100644 --- a/generators/utilities/src/main/scala/Simulator.scala +++ b/generators/utilities/src/main/scala/Simulator.scala @@ -83,6 +83,8 @@ object GenerateSimFiles extends App with HasGenerateSimConfig { } def resources(sim: Simulator): Seq[String] = Seq( "/testchipip/csrc/SimSerial.cc", + "/testchipip/csrc/testchip_fesvr.cc", + "/testchipip/csrc/testchip_fesvr.h", "/testchipip/csrc/SimDRAM.cc", "/testchipip/csrc/mm.h", "/testchipip/csrc/mm.cc", From 0c46ed167633ebe948ac746f9e0eccd9ab69b361 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 9 Oct 2020 09:34:20 -0700 Subject: [PATCH 3/3] Rename testchip_fesvr to testchip_tsi --- generators/testchipip | 2 +- generators/utilities/src/main/scala/Simulator.scala | 4 ++-- sims/firesim | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/testchipip b/generators/testchipip index 9cf31ace..56bfaa3f 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 9cf31acea528543896f04457573454a3e51f1e6a +Subproject commit 56bfaa3f9bcd11206d93fdfa3c8e7656665e462a diff --git a/generators/utilities/src/main/scala/Simulator.scala b/generators/utilities/src/main/scala/Simulator.scala index 02224fdb..f40ad032 100644 --- a/generators/utilities/src/main/scala/Simulator.scala +++ b/generators/utilities/src/main/scala/Simulator.scala @@ -83,8 +83,8 @@ object GenerateSimFiles extends App with HasGenerateSimConfig { } def resources(sim: Simulator): Seq[String] = Seq( "/testchipip/csrc/SimSerial.cc", - "/testchipip/csrc/testchip_fesvr.cc", - "/testchipip/csrc/testchip_fesvr.h", + "/testchipip/csrc/testchip_tsi.cc", + "/testchipip/csrc/testchip_tsi.h", "/testchipip/csrc/SimDRAM.cc", "/testchipip/csrc/mm.h", "/testchipip/csrc/mm.cc", diff --git a/sims/firesim b/sims/firesim index dd20a99f..6318184f 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit dd20a99f33eba31ffa2d6c7e9fc914445224d4e9 +Subproject commit 6318184f304315a94b5eb5c670f0eec1a3205f59