From 1d6d4b4e96a174548698c0e9aeabcabbba97cde2 Mon Sep 17 00:00:00 2001 From: Yunsup Lee Date: Thu, 7 Nov 2013 13:19:19 -0800 Subject: [PATCH] move htif to uncore --- rocket | 2 +- src/main/scala/RocketChip.scala | 2 +- src/main/scala/fpga.scala | 2 +- uncore | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rocket b/rocket index b1012b25..f015a75d 160000 --- a/rocket +++ b/rocket @@ -1 +1 @@ -Subproject commit b1012b251061631fe00bcdd5327a1e2fba1e6f61 +Subproject commit f015a75dd39cc5dae2aafeb23715273a5b5a614a diff --git a/src/main/scala/RocketChip.scala b/src/main/scala/RocketChip.scala index d282d2b0..b1df61c0 100644 --- a/src/main/scala/RocketChip.scala +++ b/src/main/scala/RocketChip.scala @@ -157,7 +157,7 @@ class Uncore(htif_width: Int, tileList: Seq[ClientCoherenceAgent])(implicit conf val mem_backup = new ioMemSerialized(htif_width) val mem_backup_en = Bool(INPUT) } - val htif = Module(new RocketHTIF(htif_width, conf.nSCR)) + val htif = Module(new HTIF(htif_width, PCR.RESET, conf.nSCR)) val outmemsys = Module(new OuterMemorySystem(htif_width, tileList :+ htif)) val incoherentWithHtif = (io.incoherent :+ Bool(true).asInput) outmemsys.io.incoherent := incoherentWithHtif diff --git a/src/main/scala/fpga.scala b/src/main/scala/fpga.scala index 9c880e24..3aab9d29 100644 --- a/src/main/scala/fpga.scala +++ b/src/main/scala/fpga.scala @@ -45,7 +45,7 @@ class FPGAUncore(htif_width: Int, tileList: Seq[ClientCoherenceAgent])(implicit val htif = Vec.fill(conf.nTiles){new HTIFIO(conf.nTiles)}.flip val incoherent = Vec.fill(conf.nTiles){Bool()}.asInput } - val htif = Module(new RocketHTIF(htif_width, conf.nSCR)) + val htif = Module(new HTIF(htif_width, PCR.RESET, conf.nSCR)) val outmemsys = Module(new FPGAOuterMemorySystem(htif_width, tileList :+ htif)) val incoherentWithHtif = (io.incoherent :+ Bool(true).asInput) outmemsys.io.incoherent := incoherentWithHtif diff --git a/uncore b/uncore index c0d3194f..df449873 160000 --- a/uncore +++ b/uncore @@ -1 +1 @@ -Subproject commit c0d3194ff8850a90b0d43c92c5e99e77a779f7c8 +Subproject commit df449873bef7a5b657895e5e43b4f5b3941f549e