Merge remote-tracking branch 'origin/master' into mlir-rvsdg

EECS-NTNU · Jan 14, 2024 · 5002525 · 5002525
2 parents 63cdc34 + a442652
commit 5002525
Show file tree

Hide file tree

Showing 12 changed files with 206 additions and 126 deletions.
diff --git a/Makefile b/Makefile
@@ -16,9 +16,14 @@ include Makefile.macros
 include jlm/rvsdg/Makefile.sub
 include jlm/util/Makefile.sub
 include jlm/llvm/Makefile.sub
-include jlm/hls/Makefile.sub
 include jlm/tooling/Makefile.sub
 include tests/Makefile.sub
 include tools/Makefile.sub
 
+ifdef CIRCT_PATH
+include jlm/hls/Makefile.sub
+include tools/jhls/Makefile.sub
+include tools/jlm-hls/Makefile.sub
+endif
+
 include Makefile.rules
diff --git a/configure.sh b/configure.sh
@@ -85,7 +85,8 @@ else
 fi
 
 if [ "${CIRCT_ENABLED}" == "yes" ] ; then
-	CPPFLAGS_CIRCT="-DCIRCT=1 -I${CIRCT_PATH}/include"
+	CPPFLAGS_CIRCT="-I${CIRCT_PATH}/include"
+	CXXFLAGS_CIRCT="-Wno-error=comment"
 fi
 
 CLANG_BIN=$(${LLVM_CONFIG_BIN} --bindir)
@@ -101,7 +102,7 @@ rm -rf build ; ln -sf build-"${TARGET}" build
 
 (
 	cat <<EOF
-CXXFLAGS=${CXXFLAGS} ${CXXFLAGS_COMMON} ${CXXFLAGS_TARGET}
+CXXFLAGS=${CXXFLAGS} ${CXXFLAGS_COMMON} ${CXXFLAGS_TARGET} ${CXXFLAGS_CIRCT}
 CPPFLAGS=${CPPFLAGS} ${CPPFLAGS_COMMON} ${CPPFLAGS_TARGET} ${CPPFLAGS_LLVM} ${CPPFLAGS_CIRCT}
 CIRCT_PATH=${CIRCT_PATH}
 LLVMCONFIG=${LLVM_CONFIG_BIN}

diff --git a/jlm/hls/backend/rhls2firrtl/mlirgen.cpp b/jlm/hls/backend/rhls2firrtl/mlirgen.cpp
@@ -6,8 +6,6 @@
 
 #include "jlm/hls/backend/rhls2firrtl/mlirgen.hpp"
 
-#ifdef CIRCT
-
 namespace jlm::hls
 {
 
@@ -2571,5 +2569,3 @@ MLIRGenImpl::toString(const circt::firrtl::CircuitOp circuit)
 }
 
 }
-
-#endif // CIRCT
diff --git a/jlm/hls/backend/rhls2firrtl/mlirgen.hpp b/jlm/hls/backend/rhls2firrtl/mlirgen.hpp
@@ -17,8 +17,6 @@
 #include <jlm/rvsdg/bitstring/type.hpp>
 #include <jlm/rvsdg/traverser.hpp>
 
-#ifdef CIRCT
-
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
@@ -281,6 +279,4 @@ class MLIRGen : public BaseHLS
 
 } // namespace jlm
 
-#endif // CIRCT
-
 #endif // JLM_HLS_BACKEND_RHLS2FIRRTL_MLIRGEN_HPP
diff --git a/jlm/llvm/ir/types.hpp b/jlm/llvm/ir/types.hpp
@@ -602,7 +602,7 @@ class MemoryStateType final : public jlm::rvsdg::statetype
 };
 
 template<class ELEMENTYPE>
-static inline bool
+inline bool
 IsOrContains(const jlm::rvsdg::type & type)
 {
   if (jlm::rvsdg::is<ELEMENTYPE>(type))
@@ -626,6 +626,18 @@ IsOrContains(const jlm::rvsdg::type & type)
   return false;
 }
 
+/**
+ * Given a type, determines if it is one of LLVM's aggregate types.
+ * Vectors are not considered to be aggregate types, despite being based on a subtype.
+ * @param type the type to check
+ * @return true if the type is an aggreate type, false otherwise
+ */
+inline bool
+IsAggregateType(const jlm::rvsdg::type & type)
+{
+  return jlm::rvsdg::is<arraytype>(type) || jlm::rvsdg::is<StructType>(type);
+}
+
 }
 
 #endif