Compare commits
3 Commits
wu-archite
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2bbee0542b | ||
|
|
ae552222d6 | ||
|
|
a88da88a63 |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +1,6 @@
|
|||||||
[submodule "src/main/resources/vsrc/vortex"]
|
[submodule "src/main/resources/vsrc/vortex"]
|
||||||
path = src/main/resources/vsrc/vortex
|
path = src/main/resources/vsrc/vortex
|
||||||
url = https://github.com/hansungk/vortex.git
|
url = https://github.com/hansungk/vortex.git
|
||||||
|
[submodule "cyclotron"]
|
||||||
|
path = cyclotron
|
||||||
|
url = https://github.com/hansungk/cyclotron.git
|
||||||
|
|||||||
1
cyclotron
Submodule
1
cyclotron
Submodule
Submodule cyclotron added at ca6933c4ec
Submodule src/main/resources/vsrc/vortex updated: f1d0fac518...c8529c4339
@@ -216,6 +216,7 @@ class GemminiTileModuleImp(outer: GemminiTile) extends BaseTileModuleImp(outer)
|
|||||||
val squareBoundsInst = ciscInstT.Lit(_.inst -> 0x1220b07b.U, _.rs1 -> 0.U,
|
val squareBoundsInst = ciscInstT.Lit(_.inst -> 0x1220b07b.U, _.rs1 -> 0.U,
|
||||||
_.rs2 -> (tileSizeM | (tileSizeM << 16) | (BigInt(tileSizeM) << 32)).U)
|
_.rs2 -> (tileSizeM | (tileSizeM << 16) | (BigInt(tileSizeM) << 32)).U)
|
||||||
val boundsInst = Mux(ciscId(7), squareBoundsInst, rectBoundsInst)
|
val boundsInst = Mux(ciscId(7), squareBoundsInst, rectBoundsInst)
|
||||||
|
val nopInst = ciscInstT.Lit(_.inst -> 0.U, _.rs1 -> 0.U, _.rs2 -> 0.U)
|
||||||
|
|
||||||
def genStrideInst(tileA: UInt, tileB: UInt) = {
|
def genStrideInst(tileA: UInt, tileB: UInt) = {
|
||||||
val inst = Wire(ciscInstT)
|
val inst = Wire(ciscInstT)
|
||||||
@@ -249,7 +250,9 @@ class GemminiTileModuleImp(outer: GemminiTile) extends BaseTileModuleImp(outer)
|
|||||||
val accSkipInst = genAccSkipInst(0.U, ((ciscArgs(23, 16) * spadHexadecile.U) << 32).asUInt | 0x238.U)
|
val accSkipInst = genAccSkipInst(0.U, ((ciscArgs(23, 16) * spadHexadecile.U) << 32).asUInt | 0x238.U)
|
||||||
ciscInst := microcodeEntry(Seq(boundsInst, strideInst, accSkipInst))
|
ciscInst := microcodeEntry(Seq(boundsInst, strideInst, accSkipInst))
|
||||||
}
|
}
|
||||||
is (2.U) {} // no actual invocation, fake job placeholder
|
is (2.U) {
|
||||||
|
ciscInst := microcodeEntry(Seq(nopInst))
|
||||||
|
} // no actual invocation, fake job placeholder
|
||||||
is (8.U) { // set a, b stride
|
is (8.U) { // set a, b stride
|
||||||
val inst = Wire(ciscInstT)
|
val inst = Wire(ciscInstT)
|
||||||
inst.inst := 0x1820b07b.U
|
inst.inst := 0x1820b07b.U
|
||||||
@@ -337,7 +340,7 @@ class GemminiTileModuleImp(outer: GemminiTile) extends BaseTileModuleImp(outer)
|
|||||||
gemminiIO.bits.inst := Mux(ciscValid, ciscInst.inst.asTypeOf(gemminiIO.bits.inst), regCommand)
|
gemminiIO.bits.inst := Mux(ciscValid, ciscInst.inst.asTypeOf(gemminiIO.bits.inst), regCommand)
|
||||||
gemminiIO.bits.rs1 := Mux(ciscValid, ciscInst.rs1, Cat(gemminiRs1RegMSB, gemminiRs1RegLSB))
|
gemminiIO.bits.rs1 := Mux(ciscValid, ciscInst.rs1, Cat(gemminiRs1RegMSB, gemminiRs1RegLSB))
|
||||||
gemminiIO.bits.rs2 := Mux(ciscValid, ciscInst.rs2, Cat(gemminiRs2RegMSB, gemminiRs2RegLSB))
|
gemminiIO.bits.rs2 := Mux(ciscValid, ciscInst.rs2, Cat(gemminiRs2RegMSB, gemminiRs2RegLSB))
|
||||||
gemminiIO.valid := ciscValid || regValid
|
gemminiIO.valid := (ciscValid && (ciscInst.inst =/= 0.U)) || regValid
|
||||||
assert(gemminiIO.ready || !gemminiIO.valid)
|
assert(gemminiIO.ready || !gemminiIO.valid)
|
||||||
|
|
||||||
accSlave.status := RegNext(outer.gemmini.module.io.busy).asUInt
|
accSlave.status := RegNext(outer.gemmini.module.io.busy).asUInt
|
||||||
|
|||||||
Reference in New Issue
Block a user