Merge branch 'ngc_evaluation' into '2017.1'

Allow evaluation of kernels using primitives provides as .ngc-files;

See merge request !3

common/evaluate_ip.tcl.template

@@ -19,7 +19,7 @@
 # @file		evaluate_ip.tcl.template
 # @brief	Tcl template to get area and timing estimates for IPXACT cores.
 # @authors	J. Korinth (jk@esa.cs.tu-darmstadt.de
-# 
+#
 
 # source base lib
 source -notrace "$::env(TAPASCO_HOME)/common/common.tcl"
@@ -31,6 +31,8 @@ set_param general.maxThreads 1
 
 # add files
 add_files @@SRC_FILES@@
+# Read ngc/edif files, e.g. for primitives
+foreach ngc_file [list @@NGC_FILES@@] { read_edif $ngc_file }
 # add_files -fileset constrs_1 @@XDC_FILES@@
 foreach script [list @@TCL_FILES@@] { source $script }
 

src/main/scala/tapasco/activity/EvaluateIP.scala

@@ -70,6 +70,7 @@ object EvaluateIP {
         """\.vh$""".r,
         """\.xci$""".r,
         """\.saif$""".r,
+        """\.ngc$""".r,
         """subcore.*""".r,
         """component.xml$""".r),
         Seq("""hdl/ip/""".r)
@@ -85,6 +86,9 @@ object EvaluateIP {
                 !(v_files map (_.toString) contains (f.toString.dropRight(suflen) + ".v")) &&
                 !includes.contains(f.getFileName) => f
     }
+    lazy val ngc_files  = files collect {
+      case f if """\.ngc$""".r.findFirstIn(f.toString).nonEmpty && !includes.contains(f.getFileName) => f
+    }
     lazy val hdl_files  = v_files ++ vhd_files
     lazy val logFile    = baseDir.resolve("evaluate.log")
     lazy val tclFile    = baseDir.resolve("evaluate.tcl")
@@ -162,6 +166,7 @@ object EvaluateIP {
     val needles: scala.collection.mutable.Map[String, String] = scala.collection.mutable.Map(
       "SRC_FILES"          -> (files.hdl_files map (_.toString) mkString " "),
       "TCL_FILES"          -> (files.tcl_files mkString " "),
+      "NGC_FILES"          -> (files.ngc_files mkString " "),
       "PART"               -> targetPart,
       "PERIOD"             -> targetPeriod.toString,
       "REPORT_TIMING"      -> files.rpt_timing.toString,