From 73f8ec5017c2f19e76a8c03aea364a77de826274 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Sat, 16 May 2020 22:46:39 +0000 Subject: [PATCH] [stage] Make config concatenation actually work --- .../src/main/scala/stage/ChipyardAnnotations.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/generators/chipyard/src/main/scala/stage/ChipyardAnnotations.scala b/generators/chipyard/src/main/scala/stage/ChipyardAnnotations.scala index dfee1596..d75c11a1 100644 --- a/generators/chipyard/src/main/scala/stage/ChipyardAnnotations.scala +++ b/generators/chipyard/src/main/scala/stage/ChipyardAnnotations.scala @@ -11,7 +11,12 @@ private[stage] object UnderscoreDelimitedConfigsAnnotation extends HasShellOptio override val options = Seq( new ShellOption[String]( longOption = "legacy-configs", - toAnnotationSeq = a => Seq(new ConfigsAnnotation(a.split("_"))), + toAnnotationSeq = a => { + val split = a.split('.') + val packageName = split.init.mkString(".") + val configs = split.last.split("_") + Seq(new ConfigsAnnotation(configs map { config => s"${packageName}.${config}" } )) + }, helpText = "A string of underscore-delimited configs (configs have decreasing precendence from left to right).", shortOption = Some("LC") )