SENER integration

orchestrator/taste-orchestrator.py

@@ -1566,7 +1566,7 @@ def ParseCommandLineArgs():
         elif opt in ("-x", "--timer"):
             timerResolution = arg
         elif opt == "--no-bitfile":
-            bNoBitfile = True            
+            bNoBitfile = True
         elif opt in ("-n", "--nodeOptions"):
             subName = arg.split('@')[0]
             onOffLookup = {'on': True, 'off': False}
@@ -2601,11 +2601,11 @@ def ApplyPatchForDeploymentViewNeededByOcarinaForNewEllidissTools(depl_aadlFile)
 # Note on offset ("bitFileOffset"): Is always a multiple of the biggest possible bitfile size (1526250 bytes). This is to accommodate for possible needed bitfile patching.
 # Note on Function Block's name ("fBlockName"): This information allows the reconfiguration manager to update the status global variable of the Function Block
 #   that is to be executed in HW as part of the to be loaded/burnt bitstream/bitfile (status informs e.g. about successful or failed FPGA reconfiguration). Currently only
-#   a single Function Block is associated with an FPGA configuration ("config"), since presently the HW/FPGA's VHDL projects are auto generated per Function Block. As future work, 
+#   a single Function Block is associated with an FPGA configuration ("config"), since presently the HW/FPGA's VHDL projects are auto generated per Function Block. As future work,
 #   the auto generated process could be adapted so different Function Blocks could "live" inside a single HW/FPGA configuration.
 def BraveSynthesisAndHeaderFileGen(bNoBitfile):
     if bNoBitfile == True and os.path.isfile("auto-src/bravebitfiles.h"):
-        return 
+        return
     maxBitfileSize = 1526250 # 12210000 bits / 8
     bitFileOffset = 0;
     btfileSize = 0;
@@ -2686,16 +2686,17 @@ def CallBambuForBrave(bNoBitfile):
                 shutil.rmtree(bambuDir)
             os.makedirs(bambuDir)
             os.chdir(bambuDir)
-            
+
             # C files that Bambu might need
             dataC = '../../../' + fBlockName + '/' + fBlockName + '/' + ifName + '_data.c'
             ifNameC = '../../../' + fBlockName + '/' + fBlockName + '/' + ifName + '.c'
             fBlockNameC = '../../../' + fBlockName + '/' + fBlockName + '.c'
-            
+
             bambu_cmd = ['bambu']
             bambu_cmd.append('--compiler=I386_CLANG4')
             bambu_cmd.append('--experimental-setup=BAMBU-BALANCED')
             bambu_cmd.append('--no-iob')
+            bambu_cmd.append('--clock-period=40')
             bambu_cmd.append('-O2')
             bambu_cmd.append('-funroll-loops')
             bambu_cmd.append('-fno-inline')
@@ -2729,9 +2730,10 @@ def CallBambuForBrave(bNoBitfile):
             subprocess.check_call(bambu_cmd)
 
             shutil.copyfile("bambu_" + ifName + ".vhd", "../TASTE-VHDL-DESIGN/design/bambu_" + ifName + ".vhd")
+            os.system("cp *.mem ../TASTE-VHDL-DESIGN/design/")
             os.chdir(savedDir)
-        os.chdir(savedDir)    
-    
+        os.chdir(savedDir)
+
 def main():
     FixEnvVars()
     cmdLineInformation = ParseCommandLineArgs()