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

differentiate default config package delimiter

Browse Source
This commit is contained in:
Alon Amid
2020-10-15 17:07:20 +00:00
parent 8f86b6d19a
commit 4a317b0cab
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@@ -110,7 +110,7 @@ generator_temp: $(SCALA_SOURCES) $(sim_files) $(EXTRA_GENERATOR_REQS)
--target-dir $(build_dir) \ --target-dir $(build_dir) \
--name $(long_name) \ --name $(long_name) \
--top-module $(MODEL_PACKAGE).$(MODEL) \ --top-module $(MODEL_PACKAGE).$(MODEL) \
--legacy-configs $(CONFIG_PACKAGE).$(CONFIG)) --legacy-configs $(CONFIG_PACKAGE):$(CONFIG))
.PHONY: firrtl .PHONY: firrtl
firrtl: $(FIRRTL_FILE) firrtl: $(FIRRTL_FILE)

6
generators/chipyard/src/main/scala/stage/ChipyardAnnotations.scala
View File

@@ -12,10 +12,10 @@ private[stage] object UnderscoreDelimitedConfigsAnnotation extends HasShellOptio
new ShellOption[String]( new ShellOption[String](
longOption = "legacy-configs", longOption = "legacy-configs",
toAnnotationSeq = a => { toAnnotationSeq = a => {
val split = a.split('.') val split = a.split(':')
val packageName = split.init.mkString(".") val packageName = split.head
val configs = split.last.split("_") val configs = split.last.split("_")
Seq(new ConfigsAnnotation(configs map { config => s"${packageName}.${config}" } )) Seq(new ConfigsAnnotation(configs map { config => if (config contains ".") s"${config}" else s"${packageName}.${config}" } ))
}, },
helpText = "A string of underscore-delimited configs (configs have decreasing precendence from left to right).", helpText = "A string of underscore-delimited configs (configs have decreasing precendence from left to right).",
shortOption = Some("LC") shortOption = Some("LC")