Add Rubinius MLIR scaffolding.

Author: brixen

llvm/lib/Target/Rubinius/CMakeLists.txt

@@ -1,7 +1,9 @@
+add_llvm_component_group(Rubinius)
+
 # TableGen setup: all Rubinius .td defs should be rooted at Rubinius.td
 set(LLVM_TARGET_DEFINITIONS Rubinius.td)
 
-# Generate the minimal set of backend inc files we actually use.
+# Generate the backend's TableGen outputs.
 tablegen(LLVM RubiniusGenRegisterInfo.inc   -gen-register-info)
 tablegen(LLVM RubiniusGenInstrInfo.inc      -gen-instr-info)
 tablegen(LLVM RubiniusGenSubtargetInfo.inc  -gen-subtarget)
@@ -12,51 +14,33 @@ tablegen(LLVM RubiniusGenMCCodeEmitter.inc  -gen-emitter)
 add_public_tablegen_target(RubiniusCommonTableGen)
 
 # The core codegen library for the Rubinius backend.
-# Name must match the component in llvm/lib/Target/Rubinius/LLVMBuild.txt
-# (RubiniusCodeGen).
+# Name must match the component in llvm/lib/Target/Rubinius/LLVMBuild.txt (RubiniusCodeGen).
 add_llvm_target(RubiniusCodeGen
   RubiniusAsmPrinter.cpp
-  RubiniusInstrInfo.cpp
   RubiniusISelDAGToDAG.cpp
   RubiniusISelLowering.cpp
+  RubiniusInstrInfo.cpp
   RubiniusMCInstLower.cpp
   RubiniusRegisterInfo.cpp
   RubiniusSubtarget.cpp
+  RubiniusTargetInfo.cpp
   RubiniusTargetMachine.cpp
-)
-
-add_llvm_component_library(LLVMRubiniusCodeGen
-  RubiniusTargetMachine.cpp
-  RubiniusISelLowering.cpp
-  RubiniusSubtarget.cpp
-  RubiniusAsmPrinter.cpp
-
-  DEPENDS
-  RubiniusCommonTableGen
-
-  LINK_COMPONENTS
-  AsmPrinter
-  Core
-  CodeGen
-  MC
-  SelectionDAG
-  Support
-  Target
-)
-
-add_llvm_component_library(LLVMRubiniusDesc
-  MCTargetDesc/RubiniusMCTargetDesc.cpp
-  MCTargetDesc/RubiniusMCAsmInfo.cpp
-
-  DEPENDS
-  RubiniusCommonTableGen
 
   LINK_COMPONENTS
-  MC
-  MCDisassembler
-  Support
+    AsmPrinter
+    CodeGen
+    Core
+    MC
+    SelectionDAG
+    Support
+    Target
+    RubiniusDesc
+    RubiniusInfo
+
+  ADD_TO_COMPONENT
+    Rubinius
 )
 
-# These must exist and have their own CMakeLists.txt files.
+# These subdirectories define the MC-layer and target-info libraries.
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)

llvm/lib/Target/Rubinius/LLVMBuild.txt

@@ -0,0 +1,19 @@
+[component_0]
+type = TargetGroup
+name = Rubinius
+parent = Target
+
+[component_1]
+type = Library
+name = RubiniusCodeGen
+parent = Rubinius
+
+[component_2]
+type = Library
+name = RubiniusDesc
+parent = Rubinius
+
+[component_3]
+type = Library
+name = RubiniusInfo
+parent = Rubinius

llvm/lib/Target/Rubinius/MCTargetDesc/CMakeLists.txt

@@ -1,8 +1,15 @@
-add_llvm_library(LLVMRubiniusInfo
+add_llvm_component_library(LLVMRubiniusDesc
   RubiniusMCTargetDesc.cpp
   RubiniusMCAsmInfo.cpp
+  RubiniusMCCodeEmitter.cpp
+
+  DEPENDS
+    RubiniusCommonTableGen
 
   LINK_COMPONENTS
-  MC
-  Support
+    MC
+    Support
+
+  ADD_TO_COMPONENT
+    Rubinius
 )

llvm/lib/Target/Rubinius/MCTargetDesc/RubiniusMCAsmInfo.cpp

@@ -1,7 +1,9 @@
 #include "RubiniusMCAsmInfo.h"
 using namespace llvm;
 
-RubiniusMCAsmInfo::RubiniusMCAsmInfo() {
+RubiniusMCAsmInfo::RubiniusMCAsmInfo(const Triple &TT,
+                                     const MCTargetOptions &)
+    : MCAsmInfoELF() {
   CommentString = "#";
   MinInstAlignment = 4;
 }

llvm/lib/Target/Rubinius/MCTargetDesc/RubiniusMCCodeEmitter.cpp

@@ -0,0 +1,22 @@
+// RubiniusMCCodeEmitter.cpp
+#include "llvm/MC/MCCodeEmitter.h"
+#include "llvm/MC/MCInst.h"
+#include "llvm/Support/raw_ostream.h"
+
+using namespace llvm;
+
+namespace {
+class RubiniusMCCodeEmitter : public MCCodeEmitter {
+public:
+  RubiniusMCCodeEmitter(const MCInstrInfo &, MCContext &) {}
+  void encodeInstruction(const MCInst &, raw_ostream &, SmallVectorImpl<MCFixup> &,
+                         const MCSubtargetInfo &) const override {
+    llvm_unreachable("RubiniusMCCodeEmitter not implemented yet");
+  }
+};
+} // namespace
+
+MCCodeEmitter *createRubiniusMCCodeEmitter(const MCInstrInfo &II,
+                                           MCContext &Ctx) {
+  return new RubiniusMCCodeEmitter(II, Ctx);
+}

llvm/lib/Target/Rubinius/Rubinius.td

@@ -1,5 +1,43 @@
 include "llvm/Target/Target.td"
 
+// --- Subtarget / Instruction Set -----------------------------------------
+
+def RubiniusInstrInfo : InstrInfo;
+
+class RubiniusProc<string Name>
+  : Processor<Name, NoItineraries, []>;
+def : RubiniusProc<"generic">;
+
+// --- Target ---------------------------------------------------------------
+
 def Rubinius : Target {
-  let InstructionSet = "Rubinius";
+  let InstructionSet = RubiniusInstrInfo;
+}
+
+// --- Registers ------------------------------------------------------------
+
+class RReg<string N, int Enc> : Register<N> {
+  let HWEncoding = Enc;
+  let Namespace = "Rubinius";
 }
+
+def R0 : RReg<"r0", 0>;
+def R1 : RReg<"r1", 1>;
+def R2 : RReg<"r2", 2>;
+def R3 : RReg<"r3", 3>;
+
+def GPR : RegisterClass<"Rubinius", [i64], 32,
+                        (add R0, R1, R2, R3)>;
+
+// --- Instructions ---------------------------------------------------------
+
+class RInst<string Asm> : Instruction {
+  let Namespace      = "Rubinius";
+  let OutOperandList = (outs);
+  let InOperandList  = (ins);
+  let AsmString      = Asm;
+  field bits<32> Inst;
+  let Size = 4;
+}
+
+def NOP : RInst<"nop"> { let Inst = 0; }

llvm/lib/Target/Rubinius/RubiniusTargetInfo.cpp

@@ -0,0 +1,11 @@
+#include "llvm/MC/TargetRegistry.h"
+using namespace llvm;
+
+Target &getTheRubiniusTarget() {
+  static Target T;
+  return T;
+}
+
+extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeRubiniusTargetInfo() {
+  RegisterTarget<False>(getTheRubiniusTarget(), "rubinius", "Rubinius", "Rubinius");
+}

llvm/lib/Target/Rubinius/RubiniusTargetMachine.cpp

@@ -1,28 +1,21 @@
-#include "RubiniusTargetMachine.h"
-#include "RubiniusGenSubtargetInfo.inc"
-#include "RubiniusISelLowering.h"
-#include "llvm/CodeGen/Passes.h"
-#include "llvm/CodeGen/TargetPassConfig.h"
+#include "llvm/Target/TargetMachine.h"
 #include "llvm/MC/TargetRegistry.h"
-using namespace llvm;
 
-static Target &getTheRubiniusTarget(); // from RubiniusTargetInfo.cpp
+using namespace llvm;
 
-RubiniusTargetMachine::RubiniusTargetMachine(const Target &T, const Triple &TT,
-                                     StringRef CPU, StringRef FS,
-                                     const TargetOptions &Options,
-                                     Optional<Reloc::Model> RM,
-                                     Optional<CodeModel::Model> CM,
-                                     CodeGenOptLevel OL)
-    : LLVMTargetMachine(T, "e", TT, CPU, FS, Options, RM.value_or(Reloc::Static),
-                        CM.value_or(CodeModel::Small), OL),
-      Subtarget(TT, CPU, FS, *this) {}
+extern Target &getTheRubiniusTarget();
 
-const RubiniusSubtarget *
-RubiniusTargetMachine::getSubtargetImpl(const Function &) const {
-  return &Subtarget;
-}
+class RubiniusTargetMachine : public LLVMTargetMachine {
+public:
+  RubiniusTargetMachine(const Target &T, const Triple &TT, StringRef CPU,
+                        StringRef FS, const TargetOptions &Options,
+                        std::optional<Reloc::Model> RM,
+                        std::optional<CodeModel::Model> CM,
+                        CodeGenOptLevel OL)
+      : LLVMTargetMachine(T, "e", TT, CPU, FS, Options, RM, CM, OL) {}
+};
 
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeRubiniusTarget() {
-  RegisterTargetMachine<RubiniusTargetMachine> X(getTheRubiniusTarget());
+  Target &T = getTheRubiniusTarget();
+  RegisterTargetMachine<RubiniusTargetMachine> X(T);
 }

llvm/lib/Target/Rubinius/TargetInfo/CMakeLists.txt

@@ -1,6 +1,9 @@
-add_llvm_library(LLVMRubiniusTargetInfo
+add_llvm_component_library(LLVMRubiniusInfo
   RubiniusTargetInfo.cpp
 
   LINK_COMPONENTS
-  Support
+    Support
+
+  ADD_TO_COMPONENT
+    Rubinius
 )

mlir/include/mlir/Dialect/Rubinius/Core/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(IR)