diff --git a/clang/include/clang/CIR/Dialect/IR/CIROpenCLAttrs.td b/clang/include/clang/CIR/Dialect/IR/CIROpenCLAttrs.td index b07a8cced975..8d3970f4394b 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIROpenCLAttrs.td +++ b/clang/include/clang/CIR/Dialect/IR/CIROpenCLAttrs.td @@ -86,7 +86,7 @@ def OpenCLKernelMetadataAttr mlir::cast(t).isSigned(); }; return isCIRSignedIntType(hintQTy) || - (hintEltQTy && isCIRSignedIntType(hintEltQTy.getEltType())); + (hintEltQTy && isCIRSignedIntType(hintEltQTy.getElementType())); } }]; diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td index 5a5028066bf3..88e950690bb4 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIROps.td +++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td @@ -3124,7 +3124,7 @@ def GetMethodOp : CIR_Op<"get_method"> { def VecInsertOp : CIR_Op<"vec.insert", [Pure, TypesMatchWith<"argument type matches vector element type", "vec", "value", - "cast($_self).getEltType()">, + "cast($_self).getElementType()">, AllTypesMatch<["result", "vec"]>]> { let summary = "Insert one element into a vector object"; @@ -3153,7 +3153,7 @@ def VecInsertOp : CIR_Op<"vec.insert", [Pure, def VecExtractOp : CIR_Op<"vec.extract", [Pure, TypesMatchWith<"type of 'result' matches element type of 'vec'", "vec", - "result", "cast($_self).getEltType()">]> { + "result", "cast($_self).getElementType()">]> { let summary = "Extract one element from a vector object"; let description = [{ @@ -3208,7 +3208,7 @@ def VecCreateOp : CIR_Op<"vec.create", [Pure]> { def VecSplatOp : CIR_Op<"vec.splat", [Pure, TypesMatchWith<"type of 'value' matches element type of 'result'", "result", - "value", "cast($_self).getEltType()">]> { + "value", "cast($_self).getElementType()">]> { let summary = "Convert a scalar into a vector"; let description = [{ diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td index 8d1dd609e820..89e3791036c6 100644 --- a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td +++ b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td @@ -350,18 +350,18 @@ def CIR_ArrayType : CIR_Type<"Array", "array", `CIR.array` represents C/C++ constant arrays. }]; - let parameters = (ins "mlir::Type":$eltType, "uint64_t":$size); + let parameters = (ins "mlir::Type":$elementType, "uint64_t":$size); let builders = [ TypeBuilderWithInferredContext<(ins - "mlir::Type":$eltType, "uint64_t":$size + "mlir::Type":$elementType, "uint64_t":$size ), [{ - return $_get(eltType.getContext(), eltType, size); + return $_get(elementType.getContext(), elementType, size); }]>, ]; let assemblyFormat = [{ - `<` $eltType `x` $size `>` + `<` $elementType `x` $size `>` }]; } @@ -378,18 +378,18 @@ def CIR_VectorType : CIR_Type<"Vector", "vector", element type and the number of elements. }]; - let parameters = (ins "mlir::Type":$eltType, "uint64_t":$size); + let parameters = (ins "mlir::Type":$elementType, "uint64_t":$size); let builders = [ TypeBuilderWithInferredContext<(ins - "mlir::Type":$eltType, "uint64_t":$size + "mlir::Type":$elementType, "uint64_t":$size ), [{ - return $_get(eltType.getContext(), eltType, size); + return $_get(elementType.getContext(), elementType, size); }]>, ]; let assemblyFormat = [{ - `<` $eltType `x` $size `>` + `<` $elementType `x` $size `>` }]; } @@ -588,9 +588,9 @@ def IntegerVector : Type< And<[ CPred<"::mlir::isa<::cir::VectorType>($_self)">, CPred<"::mlir::isa<::cir::IntType>(" - "::mlir::cast<::cir::VectorType>($_self).getEltType())">, + "::mlir::cast<::cir::VectorType>($_self).getElementType())">, CPred<"::mlir::cast<::cir::IntType>(" - "::mlir::cast<::cir::VectorType>($_self).getEltType())" + "::mlir::cast<::cir::VectorType>($_self).getElementType())" ".isPrimitive()"> ]>, "!cir.vector of !cir.int"> { } @@ -600,9 +600,9 @@ def SignedIntegerVector : Type< And<[ CPred<"::mlir::isa<::cir::VectorType>($_self)">, CPred<"::mlir::isa<::cir::IntType>(" - "::mlir::cast<::cir::VectorType>($_self).getEltType())">, + "::mlir::cast<::cir::VectorType>($_self).getElementType())">, CPred<"::mlir::cast<::cir::IntType>(" - "::mlir::cast<::cir::VectorType>($_self).getEltType())" + "::mlir::cast<::cir::VectorType>($_self).getElementType())" ".isSignedPrimitive()"> ]>, "!cir.vector of !cir.int"> { } @@ -612,7 +612,7 @@ def FPVector : Type< And<[ CPred<"::mlir::isa<::cir::VectorType>($_self)">, CPred<"::mlir::isa<::cir::SingleType, ::cir::DoubleType>(" - "::mlir::cast<::cir::VectorType>($_self).getEltType())">, + "::mlir::cast<::cir::VectorType>($_self).getElementType())">, ]>, "!cir.vector of !cir.fp"> { } diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp b/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp index e6ae5289618d..a8f1c0fe8a46 100644 --- a/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenBuilder.cpp @@ -19,7 +19,8 @@ mlir::Value CIRGenBuilderTy::maybeBuildArrayDecay(mlir::Location loc, if (arrayTy) { auto addrSpace = ::mlir::cast_if_present( arrayPtrTy.getAddrSpace()); - cir::PointerType flatPtrTy = getPointerTo(arrayTy.getEltType(), addrSpace); + cir::PointerType flatPtrTy = + getPointerTo(arrayTy.getElementType(), addrSpace); return create(loc, flatPtrTy, cir::CastKind::array_to_ptrdecay, arrayPtr); } @@ -81,8 +82,8 @@ void CIRGenBuilderTy::computeGlobalViewIndicesFromFlatOffset( }; if (auto ArrayTy = mlir::dyn_cast(Ty)) { - int64_t EltSize = Layout.getTypeAllocSize(ArrayTy.getEltType()); - SubType = ArrayTy.getEltType(); + int64_t EltSize = Layout.getTypeAllocSize(ArrayTy.getElementType()); + SubType = ArrayTy.getElementType(); const auto [Index, NewOffset] = getIndexAndNewOffset(Offset, EltSize); Indices.push_back(Index); Offset = NewOffset; @@ -124,7 +125,7 @@ uint64_t CIRGenBuilderTy::computeOffsetFromGlobalViewIndices( assert(idx < (int64_t)sTy.getMembers().size()); typ = sTy.getMembers()[idx]; } else if (auto arTy = dyn_cast(typ)) { - typ = arTy.getEltType(); + typ = arTy.getElementType(); offset += layout.getTypeAllocSize(typ) * idx; } else { llvm_unreachable("NYI"); diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.h b/clang/lib/CIR/CodeGen/CIRGenBuilder.h index ade1799e5ca4..825d4d20fd2e 100644 --- a/clang/lib/CIR/CodeGen/CIRGenBuilder.h +++ b/clang/lib/CIR/CodeGen/CIRGenBuilder.h @@ -405,7 +405,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy { cir::VectorType getExtendedOrTruncatedElementVectorType(cir::VectorType vt, bool isExtended, bool isSigned = false) { - auto elementTy = mlir::dyn_cast_or_null(vt.getEltType()); + auto elementTy = mlir::dyn_cast_or_null(vt.getElementType()); assert(elementTy && "expected int vector"); return cir::VectorType::get(isExtended ? getExtendedIntTy(elementTy, isSigned) @@ -534,7 +534,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy { cir::BoolType, cir::IntType, cir::CIRFPTypeInterface>(ty)) return true; if (mlir::isa(ty)) { - return isSized(mlir::cast(ty).getEltType()); + return isSized(mlir::cast(ty).getElementType()); } assert(0 && "Unimplemented size for type"); return false; @@ -904,7 +904,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy { createVecShuffle(mlir::Location loc, mlir::Value vec1, mlir::Value vec2, llvm::ArrayRef maskAttrs) { auto vecType = mlir::cast(vec1.getType()); - auto resultTy = cir::VectorType::get(getContext(), vecType.getEltType(), + auto resultTy = cir::VectorType::get(getContext(), vecType.getElementType(), maskAttrs.size()); return CIRBaseBuilderTy::create( loc, resultTy, vec1, vec2, getArrayAttr(maskAttrs)); diff --git a/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp b/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp index 7b852db212ec..c394c7cc8567 100644 --- a/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp @@ -2093,7 +2093,7 @@ static mlir::Value emitArmLdrexNon128Intrinsic(unsigned int builtinID, /// and the same vector size. static cir::VectorType getSignChangedVectorType(CIRGenBuilderTy &builder, cir::VectorType vecTy) { - auto elemTy = mlir::cast(vecTy.getEltType()); + auto elemTy = mlir::cast(vecTy.getElementType()); elemTy = elemTy.isSigned() ? builder.getUIntNTy(elemTy.getWidth()) : builder.getSIntNTy(elemTy.getWidth()); return cir::VectorType::get(elemTy, vecTy.getSize()); @@ -2102,7 +2102,7 @@ static cir::VectorType getSignChangedVectorType(CIRGenBuilderTy &builder, static cir::VectorType getHalfEltSizeTwiceNumElemsVecType(CIRGenBuilderTy &builder, cir::VectorType vecTy) { - auto elemTy = mlir::cast(vecTy.getEltType()); + auto elemTy = mlir::cast(vecTy.getElementType()); elemTy = elemTy.isSigned() ? builder.getSIntNTy(elemTy.getWidth() / 2) : builder.getUIntNTy(elemTy.getWidth() / 2); return cir::VectorType::get(elemTy, vecTy.getSize() * 2); @@ -2111,9 +2111,9 @@ getHalfEltSizeTwiceNumElemsVecType(CIRGenBuilderTy &builder, static cir::VectorType castVecOfFPTypeToVecOfIntWithSameWidth(CIRGenBuilderTy &builder, cir::VectorType vecTy) { - if (mlir::isa(vecTy.getEltType())) + if (mlir::isa(vecTy.getElementType())) return cir::VectorType::get(builder.getSInt32Ty(), vecTy.getSize()); - if (mlir::isa(vecTy.getEltType())) + if (mlir::isa(vecTy.getElementType())) return cir::VectorType::get(builder.getSInt64Ty(), vecTy.getSize()); llvm_unreachable( "Unsupported element type in getVecOfIntTypeWithSameEltWidth"); @@ -2148,7 +2148,7 @@ static mlir::Value emitNeonShiftVector(CIRGenBuilderTy &builder, llvm::SmallVector vecAttr{ vecTy.getSize(), // ConstVectorAttr requires cir::IntAttr - cir::IntAttr::get(vecTy.getEltType(), shiftAmt)}; + cir::IntAttr::get(vecTy.getElementType(), shiftAmt)}; cir::ConstVectorAttr constVecAttr = cir::ConstVectorAttr::get( vecTy, mlir::ArrayAttr::get(builder.getContext(), vecAttr)); return builder.create(loc, constVecAttr); @@ -2172,7 +2172,8 @@ static mlir::Value emitNeonRShiftImm(CIRGenFunction &cgf, mlir::Value shiftVec, mlir::Location loc) { CIRGenBuilderTy &builder = cgf.getBuilder(); int64_t shiftAmt = getIntValueFromConstOp(shiftVal); - int eltSize = cgf.CGM.getDataLayout().getTypeSizeInBits(vecTy.getEltType()); + int eltSize = + cgf.CGM.getDataLayout().getTypeSizeInBits(vecTy.getElementType()); shiftVec = builder.createBitcast(shiftVec, vecTy); // lshr/ashr are undefined when the shift amount is equal to the vector @@ -2185,7 +2186,7 @@ static mlir::Value emitNeonRShiftImm(CIRGenFunction &cgf, mlir::Value shiftVec, // Right-shifting a signed value by its size is equivalent // to a shift of size-1. --shiftAmt; - shiftVal = builder.getConstInt(loc, vecTy.getEltType(), shiftAmt); + shiftVal = builder.getConstInt(loc, vecTy.getElementType(), shiftAmt); } return emitCommonNeonShift(builder, loc, vecTy, shiftVec, shiftVal, false /* right shift */); @@ -2195,7 +2196,7 @@ static mlir::Value emitNeonRShiftImm(CIRGenFunction &cgf, mlir::Value shiftVec, static void vecExtendIntValue(CIRGenFunction &cgf, cir::VectorType argVTy, mlir::Value &arg, mlir::Location loc) { CIRGenBuilderTy &builder = cgf.getBuilder(); - cir::IntType eltTy = mlir::dyn_cast(argVTy.getEltType()); + cir::IntType eltTy = mlir::dyn_cast(argVTy.getElementType()); assert(mlir::isa(arg.getType()) && eltTy); // The constant argument to an _n_ intrinsic always has Int32Ty, so truncate // it before inserting. @@ -2366,7 +2367,7 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( case NEON::BI__builtin_neon_vabsq_v: { mlir::Location loc = getLoc(e->getExprLoc()); ops[0] = builder.createBitcast(ops[0], vTy); - if (mlir::isa(vTy.getEltType())) { + if (mlir::isa(vTy.getElementType())) { return builder.create(loc, ops[0]); } return builder.create(loc, ops[0]); @@ -2374,14 +2375,14 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( case NEON::BI__builtin_neon_vmovl_v: { cir::VectorType dTy = builder.getExtendedOrTruncatedElementVectorType( vTy, false /* truncate */, - mlir::cast(vTy.getEltType()).isSigned()); + mlir::cast(vTy.getElementType()).isSigned()); // This cast makes sure arg type conforms intrinsic expected arg type. ops[0] = builder.createBitcast(ops[0], dTy); return builder.createIntCast(ops[0], ty); } case NEON::BI__builtin_neon_vmovn_v: { cir::VectorType qTy = builder.getExtendedOrTruncatedElementVectorType( - vTy, true, mlir::cast(vTy.getEltType()).isSigned()); + vTy, true, mlir::cast(vTy.getElementType()).isSigned()); ops[0] = builder.createBitcast(ops[0], qTy); // It really is truncation in this context. // In CIR, integral cast op supports vector of int type truncating. @@ -2401,7 +2402,7 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( llvm::SmallVector mulOps(ops.begin() + 1, ops.end()); cir::VectorType srcVty = builder.getExtendedOrTruncatedElementVectorType( vTy, false, /* truncate */ - mlir::cast(vTy.getEltType()).isSigned()); + mlir::cast(vTy.getElementType()).isSigned()); ops[1] = emitNeonCall(builder, {srcVty, srcVty}, mulOps, "aarch64.neon.sqdmull", vTy, getLoc(e->getExprLoc())); ops.resize(2); @@ -2437,7 +2438,7 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( cir::VectorType resTy = (builtinID == NEON::BI__builtin_neon_vqdmulhq_lane_v || builtinID == NEON::BI__builtin_neon_vqrdmulhq_lane_v) - ? cir::VectorType::get(vTy.getEltType(), vTy.getSize() * 2) + ? cir::VectorType::get(vTy.getElementType(), vTy.getSize() * 2) : vTy; cir::VectorType mulVecT = GetNeonType(this, NeonTypeFlags(neonType.getEltType(), false, @@ -2479,7 +2480,7 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( mlir::Location loc = getLoc(e->getExprLoc()); cir::VectorType srcTy = builder.getExtendedOrTruncatedElementVectorType( vTy, false /* truncate */, - mlir::cast(vTy.getEltType()).isSigned()); + mlir::cast(vTy.getElementType()).isSigned()); ops[0] = builder.createBitcast(ops[0], srcTy); // The following cast will be lowered to SExt or ZExt in LLVM. ops[0] = builder.createIntCast(ops[0], vTy); @@ -2489,7 +2490,7 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( mlir::Location loc = getLoc(e->getExprLoc()); cir::VectorType srcTy = builder.getExtendedOrTruncatedElementVectorType( vTy, true /* extended */, - mlir::cast(vTy.getEltType()).isSigned()); + mlir::cast(vTy.getElementType()).isSigned()); ops[0] = builder.createBitcast(ops[0], srcTy); ops[0] = emitCommonNeonShift(builder, loc, srcTy, ops[0], ops[1], false); return builder.createIntCast(ops[0], vTy); @@ -2530,7 +2531,7 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( } case NEON::BI__builtin_neon_vpadd_v: case NEON::BI__builtin_neon_vpaddq_v: { - intrincsName = mlir::isa(vTy.getEltType()) + intrincsName = mlir::isa(vTy.getElementType()) ? "aarch64.neon.faddp" : "aarch64.neon.addp"; break; @@ -2619,7 +2620,7 @@ mlir::Value CIRGenFunction::emitCommonNeonBuiltinExpr( : "aarch64.neon.sqxtn"; argTypes.push_back(builder.getExtendedOrTruncatedElementVectorType( vTy, true /* extended */, - mlir::cast(vTy.getEltType()).isSigned())); + mlir::cast(vTy.getElementType()).isSigned())); break; } @@ -3965,7 +3966,7 @@ CIRGenFunction::emitAArch64BuiltinExpr(unsigned BuiltinID, const CallExpr *E, case NEON::BI__builtin_neon_vbsl_v: case NEON::BI__builtin_neon_vbslq_v: { cir::VectorType bitTy = vTy; - if (cir::isAnyFloatingPointType(bitTy.getEltType())) + if (cir::isAnyFloatingPointType(bitTy.getElementType())) bitTy = castVecOfFPTypeToVecOfIntWithSameWidth(builder, vTy); Ops[0] = builder.createBitcast(Ops[0], bitTy); Ops[1] = builder.createBitcast(Ops[1], bitTy); @@ -4086,7 +4087,7 @@ CIRGenFunction::emitAArch64BuiltinExpr(unsigned BuiltinID, const CallExpr *E, builder, {builder.getExtendedOrTruncatedElementVectorType( vTy, true /* extend */, - mlir::cast(vTy.getEltType()).isSigned()), + mlir::cast(vTy.getElementType()).isSigned()), SInt32Ty}, Ops, usgn ? "aarch64.neon.uqshrn" : "aarch64.neon.sqshrn", ty, getLoc(E->getExprLoc())); @@ -4095,7 +4096,7 @@ CIRGenFunction::emitAArch64BuiltinExpr(unsigned BuiltinID, const CallExpr *E, builder, {builder.getExtendedOrTruncatedElementVectorType( vTy, true /* extend */, - mlir::cast(vTy.getEltType()).isSigned()), + mlir::cast(vTy.getElementType()).isSigned()), SInt32Ty}, Ops, "aarch64.neon.rshrn", ty, getLoc(E->getExprLoc())); case NEON::BI__builtin_neon_vqrshrn_n_v: @@ -4103,7 +4104,7 @@ CIRGenFunction::emitAArch64BuiltinExpr(unsigned BuiltinID, const CallExpr *E, builder, {builder.getExtendedOrTruncatedElementVectorType( vTy, true /* extend */, - mlir::cast(vTy.getEltType()).isSigned()), + mlir::cast(vTy.getElementType()).isSigned()), SInt32Ty}, Ops, usgn ? "aarch64.neon.uqrshrn" : "aarch64.neon.sqrshrn", ty, getLoc(E->getExprLoc())); @@ -4469,7 +4470,7 @@ CIRGenFunction::emitAArch64BuiltinExpr(unsigned BuiltinID, const CallExpr *E, case NEON::BI__builtin_neon_vld1_lane_v: case NEON::BI__builtin_neon_vld1q_lane_v: { Ops[1] = builder.createBitcast(Ops[1], vTy); - Ops[0] = builder.createAlignedLoad(Ops[0].getLoc(), vTy.getEltType(), + Ops[0] = builder.createAlignedLoad(Ops[0].getLoc(), vTy.getElementType(), Ops[0], PtrOp0.getAlignment()); return builder.create(getLoc(E->getExprLoc()), Ops[1], Ops[0], Ops[2]); @@ -4477,7 +4478,7 @@ CIRGenFunction::emitAArch64BuiltinExpr(unsigned BuiltinID, const CallExpr *E, case NEON::BI__builtin_neon_vldap1_lane_s64: case NEON::BI__builtin_neon_vldap1q_lane_s64: { cir::LoadOp Load = builder.createAlignedLoad( - Ops[0].getLoc(), vTy.getEltType(), Ops[0], PtrOp0.getAlignment()); + Ops[0].getLoc(), vTy.getElementType(), Ops[0], PtrOp0.getAlignment()); Load.setAtomic(cir::MemOrder::Acquire); return builder.create(getLoc(E->getExprLoc()), builder.createBitcast(Ops[1], vTy), @@ -4485,7 +4486,7 @@ CIRGenFunction::emitAArch64BuiltinExpr(unsigned BuiltinID, const CallExpr *E, } case NEON::BI__builtin_neon_vld1_dup_v: case NEON::BI__builtin_neon_vld1q_dup_v: { - Address ptrAddr = PtrOp0.withElementType(builder, vTy.getEltType()); + Address ptrAddr = PtrOp0.withElementType(builder, vTy.getElementType()); mlir::Value val = builder.createLoad(getLoc(E->getExprLoc()), ptrAddr); cir::VecSplatOp vecSplat = builder.create(getLoc(E->getExprLoc()), vTy, val); diff --git a/clang/lib/CIR/CodeGen/CIRGenClass.cpp b/clang/lib/CIR/CodeGen/CIRGenClass.cpp index 1db346682531..778fd6c0a6e8 100644 --- a/clang/lib/CIR/CodeGen/CIRGenClass.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenClass.cpp @@ -1851,7 +1851,7 @@ void CIRGenFunction::emitCXXAggrConstructorCall( auto arrayTy = mlir::dyn_cast(arrayBase.getElementType()); assert(arrayTy && "expected array type"); - auto elementType = arrayTy.getEltType(); + auto elementType = arrayTy.getElementType(); auto ptrToElmType = builder.getPointerTo(elementType); // Tradional LLVM codegen emits a loop here. diff --git a/clang/lib/CIR/CodeGen/CIRGenExprConst.cpp b/clang/lib/CIR/CodeGen/CIRGenExprConst.cpp index 733025fdef4e..f2bfb5cc0bf6 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprConst.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprConst.cpp @@ -1141,7 +1141,7 @@ class ConstExprEmitter return false; auto elementRecordType = - dyn_cast(desiredArrayType.getEltType()); + dyn_cast(desiredArrayType.getElementType()); if (!elementRecordType) return false; @@ -1190,7 +1190,7 @@ class ConstExprEmitter } // Zero-fill the rest of the vector for (unsigned i = NumInits; i < NumElements; ++i) { - Elts.push_back(CGM.getBuilder().getZeroInitAttr(VecTy.getEltType())); + Elts.push_back(CGM.getBuilder().getZeroInitAttr(VecTy.getElementType())); } return cir::ConstVectorAttr::get( VecTy, mlir::ArrayAttr::get(CGM.getBuilder().getContext(), Elts)); diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp index 510e5bc75af4..f6fbef6748f5 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp @@ -2001,7 +2001,7 @@ mlir::Value ScalarExprEmitter::VisitInitListExpr(InitListExpr *E) { if (NumInitElements < VectorType.getSize()) { mlir::Value ZeroValue = CGF.getBuilder().create( CGF.getLoc(E->getSourceRange()), - CGF.getBuilder().getZeroInitAttr(VectorType.getEltType())); + CGF.getBuilder().getZeroInitAttr(VectorType.getElementType())); for (uint64_t i = NumInitElements; i < VectorType.getSize(); ++i) { Elements.push_back(ZeroValue); } @@ -2096,8 +2096,8 @@ mlir::Value ScalarExprEmitter::emitScalarCast(mlir::Value Src, QualType SrcType, mlir::Type FullDstTy = DstTy; if (mlir::isa(SrcTy) && mlir::isa(DstTy)) { // Use the element types of the vectors to figure out the CastKind. - SrcTy = mlir::dyn_cast(SrcTy).getEltType(); - DstTy = mlir::dyn_cast(DstTy).getEltType(); + SrcTy = mlir::dyn_cast(SrcTy).getElementType(); + DstTy = mlir::dyn_cast(DstTy).getElementType(); } assert(!mlir::isa(SrcTy) && !mlir::isa(DstTy) && diff --git a/clang/lib/CIR/CodeGen/CIRGenFunction.cpp b/clang/lib/CIR/CodeGen/CIRGenFunction.cpp index c2a91bda8215..2a26356cc522 100644 --- a/clang/lib/CIR/CodeGen/CIRGenFunction.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenFunction.cpp @@ -1911,7 +1911,8 @@ CIRGenFunction::emitArrayLength(const clang::ArrayType *origArrayType, countFromCLAs *= cirArrayType.getSize(); eltType = arrayType->getElementType(); - cirArrayType = mlir::dyn_cast(cirArrayType.getEltType()); + cirArrayType = + mlir::dyn_cast(cirArrayType.getElementType()); arrayType = getContext().getAsArrayType(arrayType->getElementType()); assert((!cirArrayType || arrayType) && diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp b/clang/lib/CIR/CodeGen/CIRGenModule.cpp index e9d8343aae30..33167b7c6346 100644 --- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp @@ -1470,7 +1470,8 @@ void CIRGenModule::emitGlobalVarDefinition(const clang::VarDecl *d, // TODO(cir): pointer to array decay. Should this be modeled explicitly in // CIR? if (arrayTy) - initType = cir::PointerType::get(&getMLIRContext(), arrayTy.getEltType()); + initType = + cir::PointerType::get(&getMLIRContext(), arrayTy.getElementType()); } else { assert(mlir::isa(init) && "This should have a type"); auto typedInitAttr = mlir::cast(init); @@ -1698,7 +1699,7 @@ CIRGenModule::getConstantArrayFromStringLiteral(const StringLiteral *e) { auto arrayTy = mlir::dyn_cast(convertType(e->getType())); assert(arrayTy && "string literals must be emitted as an array type"); - auto arrayEltTy = mlir::dyn_cast(arrayTy.getEltType()); + auto arrayEltTy = mlir::dyn_cast(arrayTy.getElementType()); assert(arrayEltTy && "string literal elements must be emitted as integral type"); @@ -1838,8 +1839,8 @@ CIRGenModule::getAddrOfConstantStringFromLiteral(const StringLiteral *s, auto arrayTy = mlir::dyn_cast(gv.getSymType()); assert(arrayTy && "String literal must be array"); - auto ptrTy = - getBuilder().getPointerTo(arrayTy.getEltType(), gv.getAddrSpaceAttr()); + auto ptrTy = getBuilder().getPointerTo(arrayTy.getElementType(), + gv.getAddrSpaceAttr()); return builder.getGlobalViewAttr(ptrTy, gv); } diff --git a/clang/lib/CIR/CodeGen/TargetInfo.cpp b/clang/lib/CIR/CodeGen/TargetInfo.cpp index 43d3835ca9f3..9732124fedc5 100644 --- a/clang/lib/CIR/CodeGen/TargetInfo.cpp +++ b/clang/lib/CIR/CodeGen/TargetInfo.cpp @@ -440,7 +440,7 @@ cir::VectorType ABIInfo::getOptimalVectorMemoryType(cir::VectorType T, const clang::LangOptions &Opt) const { if (T.getSize() == 3 && !Opt.PreserveVec3Type) { - return cir::VectorType::get(T.getEltType(), 4); + return cir::VectorType::get(T.getElementType(), 4); } return T; } diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp index e9973f1b4c6e..d289f4a6addd 100644 --- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp @@ -504,8 +504,8 @@ LogicalResult cir::CastOp::verify() { mlir::isa(resType)) { // Use the element type of the vector to verify the cast kind. (Except for // bitcast, see below.) - srcType = mlir::dyn_cast(srcType).getEltType(); - resType = mlir::dyn_cast(resType).getEltType(); + srcType = mlir::dyn_cast(srcType).getElementType(); + resType = mlir::dyn_cast(resType).getElementType(); } switch (getKind()) { @@ -545,7 +545,7 @@ LogicalResult cir::CastOp::verify() { if (!arrayTy) return emitOpError() << "requires !cir.array pointee"; - if (arrayTy.getEltType() != flatPtrTy.getPointee()) + if (arrayTy.getElementType() != flatPtrTy.getPointee()) return emitOpError() << "requires same type for array element and pointee result"; return success(); @@ -1046,7 +1046,7 @@ LogicalResult cir::VecCreateOp::verify() { << " doesn't match vector type " << VecTy << " element count of " << VecTy.getSize(); } - auto ElementType = VecTy.getEltType(); + auto ElementType = VecTy.getElementType(); for (auto Element : getElements()) { if (Element.getType() != ElementType) { return emitOpError() << "operand type " << Element.getType() @@ -1088,7 +1088,8 @@ LogicalResult cir::VecShuffleOp::verify() { } // The element types of the two input vectors and of the result type must // match. - if (getVec1().getType().getEltType() != getResult().getType().getEltType()) { + if (getVec1().getType().getElementType() != + getResult().getType().getElementType()) { return emitOpError() << ": element types of " << getVec1().getType() << " and " << getResult().getType() << " don't match"; } @@ -3313,7 +3314,7 @@ LogicalResult cir::ConstArrayAttr::verify( if (auto strAttr = mlir::dyn_cast(attr)) { cir::ArrayType at = mlir::cast(type); - auto intTy = mlir::dyn_cast(at.getEltType()); + auto intTy = mlir::dyn_cast(at.getElementType()); // TODO: add CIR type for char. if (!intTy || intTy.getWidth() != 8) { @@ -3435,7 +3436,8 @@ LogicalResult cir::ConstVectorAttr::verify( return; } auto typedElement = mlir::dyn_cast(element); - if (!typedElement || typedElement.getType() != vecType.getEltType()) { + if (!typedElement || + typedElement.getType() != vecType.getElementType()) { elementTypeCheck = failure(); emitError() << "constant type should match vector element type"; } diff --git a/clang/lib/CIR/Dialect/IR/CIRTypes.cpp b/clang/lib/CIR/Dialect/IR/CIRTypes.cpp index 125c9fe99f73..7660a2090b01 100644 --- a/clang/lib/CIR/Dialect/IR/CIRTypes.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRTypes.cpp @@ -388,20 +388,20 @@ DataMemberType::getABIAlignment(const ::mlir::DataLayout &dataLayout, llvm::TypeSize ArrayType::getTypeSizeInBits(const ::mlir::DataLayout &dataLayout, ::mlir::DataLayoutEntryListRef params) const { - return getSize() * dataLayout.getTypeSizeInBits(getEltType()); + return getSize() * dataLayout.getTypeSizeInBits(getElementType()); } uint64_t ArrayType::getABIAlignment(const ::mlir::DataLayout &dataLayout, ::mlir::DataLayoutEntryListRef params) const { - return dataLayout.getTypeABIAlignment(getEltType()); + return dataLayout.getTypeABIAlignment(getElementType()); } llvm::TypeSize cir::VectorType::getTypeSizeInBits( const ::mlir::DataLayout &dataLayout, ::mlir::DataLayoutEntryListRef params) const { - return llvm::TypeSize::getFixed(getSize() * - dataLayout.getTypeSizeInBits(getEltType())); + return llvm::TypeSize::getFixed( + getSize() * dataLayout.getTypeSizeInBits(getElementType())); } uint64_t @@ -767,7 +767,7 @@ bool cir::isFPOrFPVectorTy(mlir::Type t) { if (isa(t)) { return isAnyFloatingPointType( - mlir::dyn_cast(t).getEltType()); + mlir::dyn_cast(t).getElementType()); } return isAnyFloatingPointType(t); } @@ -779,7 +779,8 @@ bool cir::isFPOrFPVectorTy(mlir::Type t) { bool cir::isIntOrIntVectorTy(mlir::Type t) { if (isa(t)) { - return isa(mlir::dyn_cast(t).getEltType()); + return isa( + mlir::dyn_cast(t).getElementType()); } return isa(t); } diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRLowerContext.cpp b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRLowerContext.cpp index 3e2b4d93079a..d32e6faaedb7 100644 --- a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRLowerContext.cpp +++ b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CIRLowerContext.cpp @@ -178,7 +178,7 @@ int64_t CIRLowerContext::toBits(clang::CharUnits CharSize) const { /// instead of in bits prevents overflowing the uint64_t for some large arrays. clang::TypeInfoChars getConstantArrayInfoInChars(const CIRLowerContext &ctx, cir::ArrayType arrTy) { - clang::TypeInfoChars eltInfo = ctx.getTypeInfoInChars(arrTy.getEltType()); + clang::TypeInfoChars eltInfo = ctx.getTypeInfoInChars(arrTy.getElementType()); uint64_t tySize = arrTy.getSize(); assert((tySize == 0 || static_cast(eltInfo.Width.getQuantity()) <= (uint64_t)(-1) / tySize) && diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp index 0a0dc2de0b44..a8bd0f9e0569 100644 --- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp +++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp @@ -138,7 +138,7 @@ mlir::LLVM::FCmpPredicate convertCmpKindToFCmpPredicate(cir::CmpOpKind kind) { /// Otherwise return the given type unchanged. mlir::Type elementTypeIfVector(mlir::Type type) { if (auto VecType = mlir::dyn_cast(type)) { - return VecType.getEltType(); + return VecType.getElementType(); } return type; } @@ -607,7 +607,7 @@ mlir::Value CirAttrToValue::visitCirAttr(cir::ConstArrayAttr constArr) { mlir::dyn_cast(constArr.getElts())) { auto arrayTy = mlir::dyn_cast(strAttr.getType()); assert(arrayTy && "String attribute must have an array type"); - auto eltTy = arrayTy.getEltType(); + auto eltTy = arrayTy.getElementType(); for (auto [idx, elt] : llvm::enumerate(strAttr)) { auto init = rewriter.create( loc, converter->convertType(eltTy), elt); @@ -2974,8 +2974,9 @@ mlir::LogicalResult CIRToLLVMShiftOpLowering::matchAndRewrite( rewriter.replaceOpWithNewOp(op, llvmTy, val, amt); else { bool isUnSigned = - cirValTy ? !cirValTy.isSigned() - : !mlir::cast(cirValVTy.getEltType()).isSigned(); + cirValTy + ? !cirValTy.isSigned() + : !mlir::cast(cirValVTy.getElementType()).isSigned(); if (isUnSigned) rewriter.replaceOpWithNewOp(op, llvmTy, val, amt); else @@ -4416,11 +4417,12 @@ void prepareTypeConverter(mlir::LLVMTypeConverter &converter, return converter.convertType(abiType); }); converter.addConversion([&](cir::ArrayType type) -> mlir::Type { - auto ty = convertTypeForMemory(converter, dataLayout, type.getEltType()); + auto ty = + convertTypeForMemory(converter, dataLayout, type.getElementType()); return mlir::LLVM::LLVMArrayType::get(ty, type.getSize()); }); converter.addConversion([&](cir::VectorType type) -> mlir::Type { - auto ty = converter.convertType(type.getEltType()); + auto ty = converter.convertType(type.getElementType()); return mlir::LLVM::getFixedVectorType(ty, type.getSize()); }); converter.addConversion([&](cir::BoolType type) -> mlir::Type { diff --git a/clang/lib/CIR/Lowering/LoweringHelpers.cpp b/clang/lib/CIR/Lowering/LoweringHelpers.cpp index 26c2945105cc..89d89905ce73 100644 --- a/clang/lib/CIR/Lowering/LoweringHelpers.cpp +++ b/clang/lib/CIR/Lowering/LoweringHelpers.cpp @@ -58,7 +58,7 @@ void convertToDenseElementsAttrImpl( if (auto stringAttr = mlir::dyn_cast(attr.getElts())) { if (auto arrayType = mlir::dyn_cast(attr.getType())) { for (auto element : stringAttr) { - auto intAttr = cir::IntAttr::get(arrayType.getEltType(), element); + auto intAttr = cir::IntAttr::get(arrayType.getElementType(), element); values[currentIndex++] = mlir::dyn_cast(intAttr).getValue(); } return; @@ -126,7 +126,7 @@ lowerConstArrayAttr(cir::ConstArrayAttr constArr, auto dims = llvm::SmallVector{}; while (auto arrayType = mlir::dyn_cast(type)) { dims.push_back(arrayType.getSize()); - type = arrayType.getEltType(); + type = arrayType.getElementType(); } if (mlir::isa(constArr.getElts())) diff --git a/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp b/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp index 326152783980..7a0a9bceac23 100644 --- a/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp +++ b/clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp @@ -621,7 +621,7 @@ class CIRBinOpLowering : public mlir::OpConversionPattern { auto type = op.getLhs().getType(); if (auto VecType = mlir::dyn_cast(type)) { - type = VecType.getEltType(); + type = VecType.getElementType(); } switch (op.getKind()) { @@ -969,7 +969,7 @@ class CIRVectorCreateLowering mlir::ConversionPatternRewriter &rewriter) const override { auto vecTy = mlir::dyn_cast(op.getType()); assert(vecTy && "result type of cir.vec.create op is not VectorType"); - auto elementTy = typeConverter->convertType(vecTy.getEltType()); + auto elementTy = typeConverter->convertType(vecTy.getElementType()); auto loc = op.getLoc(); auto zeroElement = rewriter.getZeroAttr(elementTy); mlir::Value result = rewriter.create( @@ -1029,7 +1029,7 @@ class CIRVectorCmpOpLowering : public mlir::OpConversionPattern { mlir::isa(op.getRhs().getType()) && "Vector compare with non-vector type"); auto elementType = - mlir::cast(op.getLhs().getType()).getEltType(); + mlir::cast(op.getLhs().getType()).getElementType(); mlir::Value bitResult; if (auto intType = mlir::dyn_cast(elementType)) { bitResult = rewriter.create( @@ -1345,7 +1345,7 @@ static mlir::TypeConverter prepareTypeConverter() { mlir::Type curType = type; while (auto arrayType = dyn_cast(curType)) { shape.push_back(arrayType.getSize()); - curType = arrayType.getEltType(); + curType = arrayType.getElementType(); } auto elementType = converter.convertType(curType); // FIXME: The element type might not be converted (e.g. struct) @@ -1354,7 +1354,7 @@ static mlir::TypeConverter prepareTypeConverter() { return mlir::MemRefType::get(shape, elementType); }); converter.addConversion([&](cir::VectorType type) -> mlir::Type { - auto ty = converter.convertType(type.getEltType()); + auto ty = converter.convertType(type.getElementType()); return mlir::VectorType::get(type.getSize(), ty); });