colin
/
mlir-hlo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate LLVM at llvm/llvm-project@1b97cdf885 

Updates LLVM usage to match
[1b97cdf885d6](https://github.com/llvm/llvm-project/commit/1b97cdf885d6)

PiperOrigin-RevId: 348587513
This commit is contained in:
A. Unique TensorFlower 2020-12-21 23:48:24 -08:00 committed by TensorFlow MLIR Team
parent a42213b870
commit c4accdcc41
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -15,9 +15,9 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
LLVM_COMMIT = "511cfe9441955f20a8b93573fb9b62433b053550" LLVM_COMMIT = "1b97cdf885d6455841280b8da858835e641ee941"
LLVM_SHA256 = "57626cf2eb850c717b712e43774cad308f19cd9161db9ed286844ba8f42abd70" LLVM_SHA256 = "80d5036ba734fcb700a5699e2f99e5a0de5808dde01a1df3c4fae04510bc8e23"
LLVM_BAZEL_TAG = "llvm-project-{commit}".format(commit = LLVM_COMMIT) LLVM_BAZEL_TAG = "llvm-project-{commit}".format(commit = LLVM_COMMIT)

2
build_tools/llvm_version.txt
View File

@ -1,2 +1,2 @@
511cfe9441955f20a8b93573fb9b62433b053550 1b97cdf885d6455841280b8da858835e641ee941

2
lib/Dialect/mhlo/IR/chlo_ops.cc
View File

@ -202,7 +202,7 @@ LogicalResult BroadcastCompareOp::inferReturnTypeComponents(
MLIRContext* context, Optional<Location> location, ValueRange operands, MLIRContext* context, Optional<Location> location, ValueRange operands,
DictionaryAttr attributes, RegionRange regions, DictionaryAttr attributes, RegionRange regions,
SmallVectorImpl<ShapedTypeComponents>& inferedReturnShapes) { SmallVectorImpl<ShapedTypeComponents>& inferedReturnShapes) {
Type element_type = IntegerType::get(1, context); Type element_type = IntegerType::get(context, 1);
return InferBroadcastBinaryOpReturnTypeComponents(context, location, operands, return InferBroadcastBinaryOpReturnTypeComponents(context, location, operands,
attributes, element_type, attributes, element_type,
inferedReturnShapes); inferedReturnShapes);

4
lib/Dialect/mhlo/IR/hlo_ops.cc
View File

@ -621,7 +621,7 @@ OpFoldResult GetTupleElementOp::fold(ArrayRef<Attribute> operands) {
static LogicalResult Verify(TupleOp op) { static LogicalResult Verify(TupleOp op) {
SmallVector<Type, 8> operandTypes = {op.operand_type_begin(), SmallVector<Type, 8> operandTypes = {op.operand_type_begin(),
op.operand_type_end()}; op.operand_type_end()};
auto expectedType = TupleType::get(operandTypes, op.getContext()); auto expectedType = TupleType::get(op.getContext(), operandTypes);
if (op.getType() != expectedType) { if (op.getType() != expectedType) {
return op.emitOpError(llvm::formatv("has return type {0}, but expected {1}", return op.emitOpError(llvm::formatv("has return type {0}, but expected {1}",
op.getType(), expectedType)); op.getType(), expectedType));
@ -1967,7 +1967,7 @@ LogicalResult ReplicaIdOp::inferReturnTypes(
MLIRContext* context, Optional<Location>, ValueRange operands, MLIRContext* context, Optional<Location>, ValueRange operands,
DictionaryAttr, RegionRange, SmallVectorImpl<Type>& inferredReturnTypes) { DictionaryAttr, RegionRange, SmallVectorImpl<Type>& inferredReturnTypes) {
inferredReturnTypes.push_back(RankedTensorType::get( inferredReturnTypes.push_back(RankedTensorType::get(
/*shape=*/{}, IntegerType::get(32, IntegerType::Unsigned, context))); /*shape=*/{}, IntegerType::get(context, 32, IntegerType::Unsigned)));
return success(); return success();
} }

2
lib/Dialect/mhlo/transforms/legalize_to_standard.cc
View File

@ -145,7 +145,7 @@ class ConvertIotaOp : public OpRewritePattern<mhlo::IotaOp> {
auto int_shape_type = RankedTensorType::get( auto int_shape_type = RankedTensorType::get(
output_type.getShape(), output_type.getShape(),
IntegerType::get(bitwidth, rewriter.getContext())); IntegerType::get(rewriter.getContext(), bitwidth));
auto loc = op.getLoc(); auto loc = op.getLoc();
auto integer_const = rewriter.create<mlir::ConstantOp>( auto integer_const = rewriter.create<mlir::ConstantOp>(
loc, DenseIntElementsAttr::get(int_shape_type, values)); loc, DenseIntElementsAttr::get(int_shape_type, values));