diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index 0b20f84793..2d760421ac 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -26,7 +26,7 @@ jobs: # cache. build-llvm: name: Build pynqMLIR-AIE - runs-on: xrlabs-xsj + runs-on: xrlabs-xco steps: # - name: Configure Environment # run: echo "$GITHUB_WORKSPACE/llvm/install/bin" >> $GITHUB_PATH diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 15523eafb8..10aa73dcf9 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -6,8 +6,7 @@ # (c) Copyright 2023, Advanced Micro Devices, Inc. set(DATA_FILES - libadf.a - simnow_base.xclbin + dev0.xclbin generated-source/gen_cdo.h generated-source/gen_cdo.cpp generated-source/cdo_main.cpp diff --git a/data/dev0.xclbin b/data/dev0.xclbin new file mode 100644 index 0000000000..c621794b1b Binary files /dev/null and b/data/dev0.xclbin differ diff --git a/data/generated-source/gen_cdo.cpp b/data/generated-source/gen_cdo.cpp index 1861d557ee..fc18618a12 100755 --- a/data/generated-source/gen_cdo.cpp +++ b/data/generated-source/gen_cdo.cpp @@ -22,26 +22,10 @@ void addCoreEnableToCDO(){ ppgraph_core_enable(); } -//void addDbgHaltToCDO(){ -// ppgraph_core_debug_halt(); -//} -// -//void addResetConfigToCDO(){ -// resetPartition(); -//} - void addErrorHandlingToCDO(){ enableErrorHandling(); } -//void addClockGatingToCDO(){ -// enableClockGating(); -//} -// -//void addMemClearingConfigToCDO(){ -// clearPartitionMems(); -//} - void addAieElfsToCDO(const std::string &workDirPath){ std::vector elfInfoPath; if(!ppgraph_load_elf(workDirPath, elfInfoPath)) @@ -50,36 +34,6 @@ void addAieElfsToCDO(const std::string &workDirPath){ void generateCDOBinariesSeparately(const std::string &workDirPath, bool AXIdebug) { - //// aie_cdo_reset.bin - //const std::string resetCDOFilePath = workDirPath + "aie_cdo_reset.bin"; - //if(AXIdebug) std::cout << "START: Reset Configuration\n"; - //startCDOFileStream(resetCDOFilePath.c_str()); - //FileHeader(); - //addResetConfigToCDO(); - //configureHeader(); - //endCurrentCDOFileStream(); - //if(AXIdebug) std::cout << "DONE: Reset Configuration\n\n"; - - //// aie_cdo_clock_gating.bin - //const std::string clockGatingCDOFilePath = workDirPath + "aie_cdo_clock_gating.bin"; - //if(AXIdebug) std::cout << "START: Clock Gating Configuration\n"; - //startCDOFileStream(clockGatingCDOFilePath.c_str()); - //FileHeader(); - //addClockGatingToCDO(); - //configureHeader(); - //endCurrentCDOFileStream(); - //if(AXIdebug) std::cout << "DONE: Clock Gating Configuration\n\n"; - - //// aie_cdo_mem_clear.bin - //const std::string memClearingCDOFilePath = workDirPath + "aie_cdo_mem_clear.bin"; - //if(AXIdebug) std::cout << "START: Memory Clearing Configuration\n"; - //startCDOFileStream(memClearingCDOFilePath.c_str()); - //FileHeader(); - //addMemClearingConfigToCDO(); - //configureHeader(); - //endCurrentCDOFileStream(); - //if(AXIdebug) std::cout << "DONE: Memory Clearing Configuration\n\n"; - // aie_cdo_error_handling.bin const std::string errorHandlingCDOFilePath = workDirPath + "aie_cdo_error_handling.bin"; if(AXIdebug) std::cout << "START: Error Handling Configuration\n"; @@ -120,17 +74,4 @@ void generateCDOBinariesSeparately(const std::string &workDirPath, bool AXIdebug endCurrentCDOFileStream(); if(AXIdebug) std::cout << "DONE: Core Enable Configuration\n\n"; - //// aie_cdo_debug.bin - //const std::string dbgHaltCDOFilePath = workDirPath + "aie_cdo_debug.bin"; - //if(AXIdebug) std::cout << "START: Core Debug Halt Configuration\n"; - //startCDOFileStream(dbgHaltCDOFilePath.c_str()); - //FileHeader(); - //addDbgHaltToCDO(); - //configureHeader(); - //endCurrentCDOFileStream(); - //if(AXIdebug) std::cout << "DONE: Core Debug Halt Configuration\n\n"; - - //// aie_resources.bin - //const std::string aieRscsFilePath = workDirPath + "/config/aie_resources.bin"; - //dumpAllocatedRscsToFile(aieRscsFilePath); } diff --git a/data/libadf.a b/data/libadf.a deleted file mode 100755 index 8b61b79b4b..0000000000 Binary files a/data/libadf.a and /dev/null differ diff --git a/data/simnow_base.xclbin b/data/simnow_base.xclbin deleted file mode 100755 index 275ff70d6c..0000000000 Binary files a/data/simnow_base.xclbin and /dev/null differ diff --git a/python/aie/compiler/aiecc/main.py b/python/aie/compiler/aiecc/main.py index 7ea61ec5a1..6263770cab 100644 --- a/python/aie/compiler/aiecc/main.py +++ b/python/aie/compiler/aiecc/main.py @@ -377,29 +377,12 @@ async def process_xclbin_gen(self): '-image', os.path.join(self.tmpdirname,'design.bif'), '-o', os.path.join(self.tmpdirname,'design.pdi'), '-w']) - await self.do_call(task, ['v++','-p','-f','/opt/platforms/xilinx_vck190_base_202220_1/xilinx_vck190_base_202220_1.xpfm', - '-t','hw_emu', - os.path.join(self.tmpdirname,'simnow_base.xclbin'), - os.path.join(self.tmpdirname,'libadf.a'), - '-o',os.path.join(self.tmpdirname,'dev0.xclbin'), - '--advanced.param','package.generateAieIpu=true']) - xclbinutil = "/opt/xilinx/xrt/bin/xclbinutil" - await self.do_call(task, [xclbinutil, - '--replace-section', - 'PDI:raw:'+os.path.join(self.tmpdirname,'design.pdi'), - '-i',os.path.join(self.tmpdirname,'dev0.xclbin'), - '-o',os.path.join(self.tmpdirname,'dev1.xclbin'), - '--force']) - await self.do_call(task, [xclbinutil, - '--input', os.path.join(self.tmpdirname,'dev1.xclbin'), + await self.do_call(task, ['xclbinutil', + '--input' , os.path.join(self.tmpdirname,'dev0.xclbin'), '--add-kernel', os.path.join(self.tmpdirname,'kernels.json'), - '--output',os.path.join(self.tmpdirname,'dev2.xclbin'), - '--force']) - await self.do_call(task, [xclbinutil, - '--input' , os.path.join(self.tmpdirname,'dev2.xclbin'), '--add-section', - 'AIE_PARTITION[]:JSON:'+os.path.join(self.tmpdirname,'aie_partition.json'), - '--output', opts.xclbin_name, '--force']) + 'AIE_PARTITION:JSON:'+os.path.join(self.tmpdirname,'aie_partition.json'), + '--output', opts.xclbin_name]) async def process_host_cgen(self):