Fft changes (#15)

* modified CustomBundle to also apply on Int

* programmatic bundle should take T <: Data instead of Data

* turns out indexedElements doesn't synthesize

* had to change a bunch of files to get clk/pads compiling again with recent firrtl mods
This commit is contained in:
Angie Wang
2017-03-14 23:59:57 -07:00
committed by GitHub
parent 164bf2152c
commit f7056f3529
5 changed files with 16 additions and 16 deletions

View File

@@ -16,7 +16,7 @@ class AddIOPadsTransform extends Transform with SimpleRun {
val collectedAnnos = HasPadAnnotation(getMyAnnotations(state))
collectedAnnos match {
// Transform not used
case None => CircuitState(state.circuit, LowForm)
case None => state
case Some(x) =>
val techLoc = (new TechnologyLocation).get(state)
// Get foundry pad templates from yaml
@@ -45,11 +45,10 @@ class AddIOPadsTransform extends Transform with SimpleRun {
)
// Expects BlackBox helper to be run after to inline pad Verilog!
val prevAnnos = state.annotations.getOrElse(AnnotationMap(Seq.empty)).annotations
val cs = CircuitState(
runPasses(circuitWithBBs, passSeq),
LowForm,
Some(AnnotationMap(prevAnnos ++ bbAnnotations))
)
val cs = state.copy(
circuit = runPasses(circuitWithBBs, passSeq),
annotations = Some(AnnotationMap(prevAnnos ++ bbAnnotations)))
// TODO: *.f file is overwritten on subsequent executions, but it doesn't seem to be used anywhere?
(new firrtl.transforms.BlackBoxSourceHelper).execute(cs)
}