summaryrefslogtreecommitdiffstats
path: root/mlir/lib/Conversion/StandardToLLVM
diff options
context:
space:
mode:
authorNicolas Vasilache <ntv@google.com>2019-10-04 08:57:28 -0700
committerA. Unique TensorFlower <gardener@tensorflow.org>2019-10-04 08:58:09 -0700
commit754ea72794c819dceeab1f4cc15933971d228aed (patch)
treec301f077239c751386cdf8f5d89a0d66ba78a563 /mlir/lib/Conversion/StandardToLLVM
parent516f6a3477073d52224a744a720f2d62f0ea3ca9 (diff)
downloadbcm5719-llvm-754ea72794c819dceeab1f4cc15933971d228aed.tar.gz
bcm5719-llvm-754ea72794c819dceeab1f4cc15933971d228aed.zip
Replace constexpr MemRefType::kDynamicStrideOrOffset by a MemRefType:;getDynamicStrideOrOffset() method - NFC
This fixes global ODR-use issues, some of which manifest in Parser.cpp. Fixes tensorflow/mlir#167. PiperOrigin-RevId: 272886347
Diffstat (limited to 'mlir/lib/Conversion/StandardToLLVM')
-rw-r--r--mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp b/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp
index c4bf7cdd9f7..ef48950e1d0 100644
--- a/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp
+++ b/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp
@@ -578,7 +578,7 @@ struct AllocOpLowering : public LLVMLegalizationPattern<AllocOp> {
// Dynamic strides are ok if they can be deduced from dynamic sizes (which
// is guaranteed when succeeded(successStrides)). Dynamic offset however can
// never be alloc'ed.
- if (offset == MemRefType::kDynamicStrideOrOffset)
+ if (offset == MemRefType::getDynamicStrideOrOffset())
return matchFailure();
return matchSuccess();
@@ -655,7 +655,7 @@ struct AllocOpLowering : public LLVMLegalizationPattern<AllocOp> {
auto successStrides = getStridesAndOffset(type, strides, offset);
assert(succeeded(successStrides) && "unexpected non-strided memref");
(void)successStrides;
- assert(offset != MemRefType::kDynamicStrideOrOffset &&
+ assert(offset != MemRefType::getDynamicStrideOrOffset() &&
"unexpected dynamic offset");
// 0-D memref corner case: they have size 1 ...
@@ -688,7 +688,7 @@ struct AllocOpLowering : public LLVMLegalizationPattern<AllocOp> {
SmallVector<Value *, 4> strideValues(nStrides, nullptr);
for (auto indexedStride : llvm::enumerate(llvm::reverse(strides))) {
int64_t index = nStrides - 1 - indexedStride.index();
- if (strides[index] == MemRefType::kDynamicStrideOrOffset)
+ if (strides[index] == MemRefType::getDynamicStrideOrOffset())
// Identity layout map is enforced in the match function, so we compute:
// `runningStride *= sizes[index]`
runningStride = runningStride
@@ -920,14 +920,14 @@ struct LoadStoreOpLowering : public LLVMLegalizationPattern<Derived> {
loc, elementTypePtr, memRefDescriptor,
rewriter.getIndexArrayAttr(kPtrPosInMemRefDescriptor));
Value *offsetValue =
- offset == MemRefType::kDynamicStrideOrOffset
+ offset == MemRefType::getDynamicStrideOrOffset()
? rewriter.create<LLVM::ExtractValueOp>(
loc, indexTy, memRefDescriptor,
rewriter.getIndexArrayAttr(kOffsetPosInMemRefDescriptor))
: this->createIndexConstant(rewriter, loc, offset);
for (int i = 0, e = indices.size(); i < e; ++i) {
Value *stride;
- if (strides[i] != MemRefType::kDynamicStrideOrOffset) {
+ if (strides[i] != MemRefType::getDynamicStrideOrOffset()) {
// Use static stride.
auto attr =
rewriter.getIntegerAttr(rewriter.getIndexType(), strides[i]);
OpenPOWER on IntegriCloud