Applied suggestions

Author: victor-eds

polygeist/tools/cgeist/Lib/CGExpr.cc

@@ -2642,18 +2642,18 @@ static Optional<Value> castSubIndexOpIndex(OpBuilder &Builder, Location Loc,
                                            ValueCategory Pointer,
                                            ValueRange IdxList, bool IsSigned) {
   if (Pointer.val.getType().isa<MemRefType>()) {
-    assert(IdxList.size() == 1 && "SubIndexOP accepts just an index");
+    assert(IdxList.size() == 1 && "SubIndexOp accepts just an index");
     return ValueCategory(IdxList.front(), false)
         .IntCast(Builder, Loc, Builder.getIndexType(), IsSigned)
         .val;
   }
   return llvm::None;
 }
 
-ValueCategory MLIRScanner::EmitCheckedInBoundsGEP(mlir::Type ElemTy,
-                                                  ValueCategory Pointer,
-                                                  ValueRange IdxList,
-                                                  bool IsSigned, bool) {
+ValueCategory MLIRScanner::EmitCheckedInBoundsPtrOffsetOp(mlir::Type ElemTy,
+                                                          ValueCategory Pointer,
+                                                          ValueRange IdxList,
+                                                          bool IsSigned, bool) {
   assert(mlirclang::isPointerOrMemRefTy(Pointer.val.getType()) &&
          "Expecting pointer or MemRef");
   assert(std::all_of(IdxList.begin(), IdxList.end(),
@@ -2681,20 +2681,17 @@ ValueCategory MLIRScanner::EmitPointerArithmetic(const BinOpInfo &Info) {
   const auto IsSubtraction =
       Opcode == clang::BO_Sub || Opcode == clang::BO_SubAssign;
 
-  // In a subtraction, the LHS is always the pointer.
-  if (!IsSubtraction &&
-      !mlirclang::isPointerOrMemRefTy(Pointer.val.getType())) {
+  assert((!IsSubtraction ||
+          mlirclang::isPointerOrMemRefTy(Pointer.val.getType())) &&
+         "The LHS is always a pointer in a subtraction");
+
+  if (!mlirclang::isPointerOrMemRefTy(Pointer.val.getType())) {
     std::swap(Pointer, Index);
     std::swap(PointerOperand, IndexOperand);
   }
 
   assert(Index.val.getType().isa<IntegerType>() && "Expecting integer type");
 
-  const auto IsSigned =
-      IndexOperand->getType()->isSignedIntegerOrEnumerationType();
-
-  const unsigned Width = Index.val.getType().getIntOrFloatBitWidth();
-
   auto PtrTy = Pointer.val.getType();
 
   assert(mlirclang::isPointerOrMemRefTy(PtrTy) && "Expecting pointer type");
@@ -2727,6 +2724,9 @@ ValueCategory MLIRScanner::EmitPointerArithmetic(const BinOpInfo &Info) {
   auto &DL = CGM.getDataLayout();
   const unsigned IndexTypeSize = DL.getIndexTypeSizeInBits(
       CGM.getTypes().ConvertType(PointerOperand->getType()));
+  const auto IsSigned =
+      IndexOperand->getType()->isSignedIntegerOrEnumerationType();
+  const unsigned Width = Index.val.getType().getIntOrFloatBitWidth();
   if (Width != IndexTypeSize) {
     // Zero-extend or sign-extend the pointer value according to
     // whether the index is signed or not.
@@ -2765,8 +2765,8 @@ ValueCategory MLIRScanner::EmitPointerArithmetic(const BinOpInfo &Info) {
     return Pointer.GEPOrSubIndex(builder, loc, ElemTy, Index.val);
   }
 
-  return EmitCheckedInBoundsGEP(ElemTy, Pointer, Index.val, IsSigned,
-                                IsSubtraction);
+  return EmitCheckedInBoundsPtrOffsetOp(ElemTy, Pointer, Index.val, IsSigned,
+                                        IsSubtraction);
 }
 
 ValueCategory MLIRScanner::EmitBinAdd(const BinOpInfo &Info) {

polygeist/tools/cgeist/Lib/TypeUtils.h

@@ -48,6 +48,8 @@ bool isRecursiveStruct(llvm::Type *T, llvm::Type *Meta,
 mlir::IntegerAttr wrapIntegerMemorySpace(unsigned MemorySpace,
                                          mlir::MLIRContext *Ctx);
 
+/// Given a MemRefType or LLVMPointerType, change the element type, keeping the
+/// rest of the parameters.
 mlir::Type getPtrTyWithNewType(mlir::Type Orig, mlir::Type NewElementType);
 
 mlir::Type getSYCLType(const clang::RecordType *RT,

polygeist/tools/cgeist/Lib/clang-mlir.h

@@ -507,9 +507,11 @@ class MLIRScanner : public clang::StmtVisitor<MLIRScanner, ValueCategory> {
   EmitCompoundAssign(clang::CompoundAssignOperator *E,
                      ValueCategory (MLIRScanner::*F)(const BinOpInfo &));
 
-  ValueCategory EmitCheckedInBoundsGEP(mlir::Type ElemTy, ValueCategory Pointer,
-                                       mlir::ValueRange IdxList, bool IsSigned,
-                                       bool IsSubtraction);
+  ValueCategory EmitCheckedInBoundsPtrOffsetOp(mlir::Type ElemTy,
+                                               ValueCategory Pointer,
+                                               mlir::ValueRange IdxList,
+                                               bool IsSigned,
+                                               bool IsSubtraction);
   ValueCategory EmitPointerArithmetic(const BinOpInfo &Info);
 
   BinOpInfo EmitBinOps(clang::BinaryOperator *E,