Turn GEP instructions into PtrAdds.

Co-authored-by: Edd Barrett <[email protected]>

Author: vext01

llvm/lib/YkIR/YkIRWriter.cpp

@@ -39,13 +39,13 @@ enum OpCode {
   Store,
   Alloca,
   Call,
-  GetElementPtr,
   Br,
   CondBr,
   ICmp,
   BinaryOperator,
   Ret,
   InsertValue,
+  PtrAdd,
   UnimplementedInstruction = 255, // YKFIXME: Will eventually be deleted.
 };
 
@@ -124,6 +124,7 @@ class YkIRWriter {
 private:
   Module &M;
   MCStreamer &OutStreamer;
+  DataLayout DL;
 
   vector<llvm::Type *> Types;
   vector<llvm::Constant *> Constants;
@@ -326,6 +327,40 @@ class YkIRWriter {
     }
   }
 
+  void serialiseGetElementPtr(GetElementPtrInst *I, ValueLoweringMap &VLMap,
+                              unsigned BBIdx, unsigned &InstIdx) {
+    unsigned BitWidth = 64;
+    MapVector<Value *, APInt> Offsets;
+    APInt Offset(BitWidth, 0);
+
+    bool Res = I->collectOffset(DL, BitWidth, Offsets, Offset);
+    assert(Res);
+
+    // type_index:
+    OutStreamer.emitSizeT(typeIndex(I->getType()));
+    // opcode:
+    serialiseOpcode(OpCode::PtrAdd);
+    // num_operands:
+    OutStreamer.emitInt32(2);
+    // pointer:
+    serialiseOperand(I, VLMap, I->getPointerOperand());
+    // offset:
+    serialiseOperand(I, VLMap, ConstantInt::get(I->getContext(), Offset));
+
+    VLMap[I] = {BBIdx, InstIdx};
+    InstIdx++;
+  }
+
+  void serialiseStore(StoreInst *I, ValueLoweringMap &VLMap, unsigned BBIdx,
+      unsigned &InstIdx)
+  {
+    if (I->getNumOperands() == 2) {
+      serialiseInstGeneric(I, VLMap, BBIdx, InstIdx, OpCode::Store);
+    } else {
+      serialiseUnimplementedInstruction(I, VLMap, BBIdx, InstIdx);
+    }
+  }
+
   void serialiseInst(Instruction *I, ValueLoweringMap &VLMap, unsigned BBIdx,
                      unsigned &InstIdx) {
 // Macros to help dispatch to serialisers.
@@ -344,7 +379,6 @@ class YkIRWriter {
 
     GENERIC_INST_SERIALISE(I, LoadInst, Load)
     GENERIC_INST_SERIALISE(I, StoreInst, Store)
-    GENERIC_INST_SERIALISE(I, GetElementPtrInst, GetElementPtr)
     GENERIC_INST_SERIALISE(I, ICmpInst, ICmp)
     GENERIC_INST_SERIALISE(I, llvm::BinaryOperator, BinaryOperator)
     GENERIC_INST_SERIALISE(I, ReturnInst, Ret)
@@ -353,6 +387,8 @@ class YkIRWriter {
     CUSTOM_INST_SERIALISE(I, AllocaInst, serialiseAllocaInst)
     CUSTOM_INST_SERIALISE(I, CallInst, serialiseCallInst)
     CUSTOM_INST_SERIALISE(I, BranchInst, serialiseBranchInst)
+    CUSTOM_INST_SERIALISE(I, GetElementPtrInst, serialiseGetElementPtr)
+    CUSTOM_INST_SERIALISE(I, StoreInst, serialiseStore)
 
     // GENERIC_INST_SERIALISE and CUSTOM_INST_SERIALISE do an early return upon
     // a match, so if we get here then the instruction wasn't handled.
@@ -487,7 +523,7 @@ class YkIRWriter {
 
 public:
   YkIRWriter(Module &M, MCStreamer &OutStreamer)
-      : M(M), OutStreamer(OutStreamer) {}
+      : M(M), OutStreamer(OutStreamer), DL(&M) {}
 
   // Entry point for IR serialisation.
   //