Commit d32c94ff authored by Jens Korinth's avatar Jens Korinth
Browse files

Closes #72 - Rename .bit file

* changed to better name reflecting composition, target and freq
parent f149a3d0
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
**/ **/
package de.tu_darmstadt.cs.esa.tapasco.activity.composers package de.tu_darmstadt.cs.esa.tapasco.activity.composers
import de.tu_darmstadt.cs.esa.tapasco.base._ import de.tu_darmstadt.cs.esa.tapasco.base._
import de.tu_darmstadt.cs.esa.tapasco.dse._
import de.tu_darmstadt.cs.esa.tapasco.reports._ import de.tu_darmstadt.cs.esa.tapasco.reports._
/** Wrapper trait for synthesis tools: basic interface to synthesise compositions /** Wrapper trait for synthesis tools: basic interface to synthesise compositions
...@@ -78,6 +79,12 @@ object Composer { ...@@ -78,6 +79,12 @@ object Composer {
case Implementation.Vivado => new VivadoComposer()(cfg, maxThreads) case Implementation.Vivado => new VivadoComposer()(cfg, maxThreads)
} }
/** Make a name for the Composer project. */
def mkProjectName(c: Composition, t: Target, f: Heuristics.Frequency): String = "%s--%s--%s".format(
"%s-%s".format(t.ad.name, t.pd.name),
c.composition map (ce => "%s_%d".format(ce.kernel.replaceAll(" ", "-"), ce.count)) mkString ("_"),
"%05.1f".format(f))
/** Extended result with additional information as provided by the tool. **/ /** Extended result with additional information as provided by the tool. **/
final case class Result( final case class Result(
result: ComposeResult, result: ComposeResult,
......
...@@ -54,7 +54,7 @@ class VivadoComposer()(implicit cfg: Configuration, maxThreads: Option[Int]) ext ...@@ -54,7 +54,7 @@ class VivadoComposer()(implicit cfg: Configuration, maxThreads: Option[Int]) ext
// create Tcl script // create Tcl script
mkTclScript(fromTemplate = Common.commonDir.resolve("design.master.tcl.template"), mkTclScript(fromTemplate = Common.commonDir.resolve("design.master.tcl.template"),
to = files.tclFile, to = files.tclFile,
projectName = bd.id, projectName = Composer.mkProjectName(bd, target, f),
header = makeHeader(bd, target, f, archFeatures, platformFeatures), header = makeHeader(bd, target, f, archFeatures, platformFeatures),
target = target, target = target,
composition = composition(bd, target)) composition = composition(bd, target))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment