Support OCLA

os-fpga · Aug 29, 2023 · be078e2 · be078e2
1 parent c6b101a
commit be078e2
Show file tree

Hide file tree

Showing 10 changed files with 1,575 additions and 221 deletions.
diff --git a/FOEDAG b/FOEDAG
diff --git a/src/ConfigurationRS/BitAssembler/BitAssembler.cpp b/src/ConfigurationRS/BitAssembler/BitAssembler.cpp
@@ -2,6 +2,7 @@
 
 #include "BitAssembler_ddb.h"
 #include "BitAssembler_mgr.h"
+#include "BitAssembler_ocla.h"
 #include "BitGenerator/BitGenerator.h"
 #include "CFGCommonRS/CFGArgRS_auto.h"
 #include "CFGObject/CFGObject_auto.h"
@@ -59,6 +60,15 @@ void BitAssembler_entry(const CFGCommon_ARG* cmdarg) {
       mgr.get_ql_membank_fcb(&bitobj.ql_membank_fcb);
     }
 
+    // OCLA
+    std::string yosysBin = CFG_print("%s/yosys", cmdarg->binPath.c_str());
+    std::string hierPath =
+        CFG_print("%s/hier_info.json", cmdarg->analyzePath.c_str());
+    std::string ysPath = CFG_print("%s/%s.ys", cmdarg->synthesisPath.c_str(),
+                                   cmdarg->projectName.c_str());
+    BitAssembler_OCLA::parse(bitobj, cmdarg->taskPath.c_str(), yosysBin,
+                             hierPath, ysPath);
+
     // Writing out
     bitgen = bitobj.write(bitasm_file);
     CFG_POST_MSG("  Status: %s", bitgen ? "success" : "fail");

diff --git a/src/ConfigurationRS/BitAssembler/BitAssembler_ddb.cpp b/src/ConfigurationRS/BitAssembler/BitAssembler_ddb.cpp
@@ -8,7 +8,6 @@
 #include "BitAssembler_mgr.h"
 #include "CFGCommonRS/CFGCommonRS.h"
 #include "CFGObject/CFGObject_auto.h"
-#include "nlohmann_json/json.hpp"
 
 void CFG_ddb_search_device(const std::string& filepath,
                            const std::string& device_name,
+1 −1		CMakeLists.txt
+4 −0		src/Compiler/Compiler.cpp
+2 −0		src/Compiler/Compiler.h
+8 −6		src/Compiler/CompilerOpenFPGA.cpp
+6 −0		src/Compiler/TaskManager.cpp
+8 −6		src/Compiler/TaskManager.h
+10 −9		src/Configuration/CFGCommon/CFGCommon.cpp
+9 −6		src/Configuration/CFGCommon/CFGCommon.h
+7 −2		src/Configuration/CFGCompiler/CFGCompiler.cpp
+8 −0		src/DeviceModeling/device_signal.h
+1 −1		tests/unittest/CFGCommon/CFGArg_test.cpp
+11 −1		tests/unittest/CFGCommon/CFGCommon_test.cpp
+1 −1		tests/unittest/CFGCompiler/CFGCompiler_test.cpp
+2 −0		tests/unittest/CMakeLists.txt
+70 −0		tests/unittest/Compiler/TaskManager_test.cpp
+74 −0		tests/unittest/DeviceModeling/device_signal_test.cpp
+1 −1		third_party/gtkwave