add typecache for sys integers

ShlKan · Jan 12, 2025 · e93f794 · e93f794
1 parent fe18085
commit e93f794
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/IRAnalysis/CodeGen/SysGenModule.cpp b/IRAnalysis/CodeGen/SysGenModule.cpp
@@ -8,15 +8,18 @@
 #include "CIRGenModule.h"
 #include "SysGenProcess.h"
 #include "SysIR/Dialect/IR/SysDialect.h"
+#include "SysIR/Dialect/IR/SysTypes.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/Type.h"
+#include "clang/Basic/LLVM.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <utility>
@@ -63,14 +66,14 @@ void SysGenModule::buildSysModule(clang::CXXRecordDecl *moduleDecl) {
   builder.setInsertionPointToEnd(theModule.getBody());
 
   for (const auto &field : moduleDecl->fields()) {
+    auto val = field->getInClassInitializer()->EvaluateKnownConstInt(
+        moduleDecl->getASTContext());
     auto ty = astCtx.getCanonicalType(field->getType());
     switch (field->getType().getTypePtr()->getTypeClass()) {
     case clang::Type::Builtin: {
       switch (llvm::dyn_cast<clang::BuiltinType>(ty)->getKind()) {
       case clang::BuiltinType::Int: {
-        mlir::cir::IntType i32Ty = SInt32Ty;
-        builder.create<mlir::cir::ConstantOp>(
-            getLoc(field->getLocation()), mlir::cir::IntAttr::get(i32Ty, 2));
+        builder.getConstInt(getLoc(field->getLocation()), val);
         break;
       }
       default:
@@ -101,6 +104,22 @@ void SysGenModule::buildSysModule(clang::CXXRecordDecl *moduleDecl) {
   theModule->dump();
 }
 
+mlir::sys::SIntType SysGenModule::getSSignedIntType(uint32_t size) {
+  if (sSignedIntTyMap.count(size))
+    return sSignedIntTyMap[size];
+  auto ty = mlir::sys::SIntType::get(builder.getContext(), size, true);
+  sSignedIntTyMap[size] = ty;
+  return ty;
+}
+
+mlir::sys::SIntType SysGenModule::getSUSignedIntType(uint32_t size) {
+  if (sUnsigendIntTyMap.count(size))
+    return sUnsigendIntTyMap[size];
+  auto ty = mlir::sys::SIntType::get(builder.getContext(), size, false);
+  sUnsigendIntTyMap[size] = ty;
+  return ty;
+}
+
 SysGenModule::~SysGenModule() {}
 
 } // namespace sys
diff --git a/IRAnalysis/CodeGen/SysGenModule.h b/IRAnalysis/CodeGen/SysGenModule.h
@@ -9,11 +9,14 @@
 #include "clang/AST/Expr.h"
 #include "clang/Basic/Diagnostic.h"
 #include "llvm/ADT/SmallVector.h"
+#include <cstdint>
+#include <map>
 
 #include "CIRGenModule.h"
 
 #include "CPPFrontend/CIROptions.h"
 
+#include "SysIR/Dialect/IR/SysTypes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/MLIRContext.h"
@@ -32,12 +35,15 @@ class SysGenModule : public cir::CIRGenModule {
                const cir::CIROptions &CIROption,
                clang::DiagnosticsEngine &Diags);
 
+  mlir::sys::SIntType getSSignedIntType(uint32_t size);
+  mlir::sys::SIntType getSUSignedIntType(uint32_t size);
+
   ~SysGenModule();
 
 private:
   llvm::SmallVector<clang::StringLiteral *, 4> processNames;
-
-private:
+  std::map<uint32_t, mlir::sys::SIntType> sSignedIntTyMap;
+  std::map<uint32_t, mlir::sys::SIntType> sUnsigendIntTyMap;
   void collectProcess(clang::CXXRecordDecl *moduleDecl);
 
 public:

diff --git a/IRAnalysis/test/SystemC/process.cpp b/IRAnalysis/test/SystemC/process.cpp
@@ -7,7 +7,7 @@ SC_MODULE(Process) {
     SC_THREAD(emptyProcess1);
   }
 
-  int x;
+  int x = 9;
   void emptyProcess() {
     // Do nothing.
   }