1
0

Push chisel, rocket, hwacha, tools, tests to incorporate a bunch of new changes (ISA alterations)

This commit is contained in:
Stephen Twigg
2014-01-21 14:48:04 -08:00
parent 37b86c89fa
commit ee0c4ca291
8 changed files with 8 additions and 8 deletions

2
chisel

Submodule chisel updated: 4483d41471...ae1d1de821

View File

@ -125,7 +125,7 @@ int main(int argc, char** argv)
} }
if (log) if (log)
tile.print(stderr); tile.print(stderr, stderr);
if (vcd) if (vcd)
tile.dump(vcdfile, trace_count); tile.dump(vcdfile, trace_count);

Submodule riscv-tests updated: fdf5e6f97d...7356626efe

2
rocket

Submodule rocket updated: 5555e6f748...9aa03938c0

View File

@ -157,7 +157,7 @@ class Uncore(htif_width: Int, tileList: Seq[ClientCoherenceAgent])(implicit conf
val mem_backup = new ioMemSerialized(htif_width) val mem_backup = new ioMemSerialized(htif_width)
val mem_backup_en = Bool(INPUT) val mem_backup_en = Bool(INPUT)
} }
val htif = Module(new HTIF(htif_width, PCR.RESET, conf.nSCR)) val htif = Module(new HTIF(htif_width, CSRs.reset, conf.nSCR))
val outmemsys = Module(new OuterMemorySystem(htif_width, tileList :+ htif)) val outmemsys = Module(new OuterMemorySystem(htif_width, tileList :+ htif))
val incoherentWithHtif = (io.incoherent :+ Bool(true).asInput) val incoherentWithHtif = (io.incoherent :+ Bool(true).asInput)
outmemsys.io.incoherent := incoherentWithHtif outmemsys.io.incoherent := incoherentWithHtif

View File

@ -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 htif = Vec.fill(conf.nTiles){new HTIFIO(conf.nTiles)}.flip
val incoherent = Vec.fill(conf.nTiles){Bool()}.asInput val incoherent = Vec.fill(conf.nTiles){Bool()}.asInput
} }
val htif = Module(new HTIF(htif_width, PCR.RESET, conf.nSCR)) val htif = Module(new HTIF(htif_width, CSRs.reset, conf.nSCR))
val outmemsys = Module(new FPGAOuterMemorySystem(htif_width, tileList :+ htif)) val outmemsys = Module(new FPGAOuterMemorySystem(htif_width, tileList :+ htif))
val incoherentWithHtif = (io.incoherent :+ Bool(true).asInput) val incoherentWithHtif = (io.incoherent :+ Bool(true).asInput)
outmemsys.io.incoherent := incoherentWithHtif outmemsys.io.incoherent := incoherentWithHtif

2
uncore

Submodule uncore updated: ac4a5373c6...a58265755f