wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #89 from ucb-bar/support-plusargs

Browse Source 
Support plusarg_reader in TestHarness | explicitly name generated IOs
This commit is contained in:
Jerry Zhao
2020-09-18 13:28:31 -07:00
committed by GitHub
parent 1435f09ce6 4a5c75fcf8
commit 382cefcee0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
iocell/src/main/scala/chisel/IOCell.scala
View File

@@ -127,13 +127,13 @@ object IOCell {
* AsyncReset, and otherwise to Bool (sync reset) * AsyncReset, and otherwise to Bool (sync reset)
* @return A tuple of (the generated IO data node, a Seq of all generated IO cell instances) * @return A tuple of (the generated IO data node, a Seq of all generated IO cell instances)
*/ */
def generateIOFromSignal[T <: Data](coreSignal: T, name: Option[String] = None, def generateIOFromSignal[T <: Data](coreSignal: T, name: String,
typeParams: IOCellTypeParams = GenericIOCellParams(), typeParams: IOCellTypeParams = GenericIOCellParams(),
abstractResetAsAsync: Boolean = false): (T, Seq[IOCell]) = abstractResetAsAsync: Boolean = false): (T, Seq[IOCell]) =
{ {
val padSignal = IO(DataMirror.internal.chiselTypeClone[T](coreSignal)) val padSignal = IO(DataMirror.internal.chiselTypeClone[T](coreSignal)).suggestName(name)
val resetFn = if (abstractResetAsAsync) toAsyncReset else toSyncReset val resetFn = if (abstractResetAsAsync) toAsyncReset else toSyncReset
val iocells = IOCell.generateFromSignal(coreSignal, padSignal, name, typeParams, resetFn) val iocells = IOCell.generateFromSignal(coreSignal, padSignal, Some(s"iocell_$name"), typeParams, resetFn)
(padSignal, iocells) (padSignal, iocells)
} }

2
tapeout/src/main/scala/transforms/Generate.scala
View File

@@ -221,7 +221,7 @@ sealed trait GenerateTopAndHarnessApp extends LazyLogging { this: App =>
// Execute top and get list of ExtModules to avoid collisions // Execute top and get list of ExtModules to avoid collisions
val topExtModules = executeTop() val topExtModules = executeTop()
val externals = Seq("SimSerial", "SimDTM") ++ harnessTop ++ synTop val externals = Seq("SimSerial", "SimDTM", "plusarg_reader") ++ harnessTop ++ synTop
val harnessAnnos = val harnessAnnos =
tapeoutOptions.harnessDotfOut.map(BlackBoxResourceFileNameAnno(_)).toSeq ++ tapeoutOptions.harnessDotfOut.map(BlackBoxResourceFileNameAnno(_)).toSeq ++