llvm
/
torch-mlir
mirror of https://github.com/llvm/torch-mlir
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump llvm-project to f66cd9e9556a53142a26a5c21a72e21f1579217c. (#2466) 

Picks up DenseResourceElementsAttr python support and fixes minf/maxf
C++ rename.
pull/2447/merge
Stella Laurenzo 2023-09-19 10:50:53 -07:00 committed by GitHub
parent b03efdf2e4
commit 278c41e938
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -3,4 +3,4 @@
url = https://github.com/llvm/llvm-project.git url = https://github.com/llvm/llvm-project.git
[submodule "externals/stablehlo"] [submodule "externals/stablehlo"]
path = externals/stablehlo path = externals/stablehlo
url = https://github.com/openxla/stablehlo.git url = https://github.com/shark-infra/stablehlo.git

2
externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/IR/TMTensorOps.cpp vendored
View File

@ -233,7 +233,7 @@ LogicalResult AttentionOp::generateScalarImplementation(OpBuilder &b,
loc, init, loc, init,
[&](OpBuilder &b, Location loc, Value elem, Value acc) { [&](OpBuilder &b, Location loc, Value elem, Value acc) {
Value x = b.create<memref::LoadOp>(loc, weight, localIVs); Value x = b.create<memref::LoadOp>(loc, weight, localIVs);
Value max = b.create<arith::MaxFOp>(loc, x, acc); Value max = b.create<arith::MaximumFOp>(loc, x, acc);
b.create<scf::ReduceReturnOp>(loc, max); b.create<scf::ReduceReturnOp>(loc, max);
}); });
}) })

2
externals/llvm-project vendored

@ -1 +1 @@
Subproject commit 4acc3ffbb0af5631bc7916aeff3570f448899647 Subproject commit f66cd9e9556a53142a26a5c21a72e21f1579217c

8
lib/Conversion/TorchToLinalg/Reduction.cpp
View File

@ -176,8 +176,8 @@ public:
Value resultMax, predicate; Value resultMax, predicate;
if (inElementType.isa<mlir::FloatType>()) { if (inElementType.isa<mlir::FloatType>()) {
resultMax = resultMax = rewriter.create<arith::MaximumFOp>(nestedLoc, newValue,
rewriter.create<arith::MaxFOp>(nestedLoc, newValue, oldValue); oldValue);
predicate = rewriter.create<arith::CmpFOp>( predicate = rewriter.create<arith::CmpFOp>(
nestedLoc, arith::CmpFPredicate::OGT, newValue, oldValue); nestedLoc, arith::CmpFPredicate::OGT, newValue, oldValue);
} else { } else {
@ -280,7 +280,7 @@ static Value createLinalgPayloadForReduceOp(OpBuilder &b, Location loc,
convertScalarToDtype(b, loc, payloadArgs[0], resultElementType); convertScalarToDtype(b, loc, payloadArgs[0], resultElementType);
Value result = payloadArgs[1]; Value result = payloadArgs[1];
if (resultElementType.isa<mlir::FloatType>()) if (resultElementType.isa<mlir::FloatType>())
return b.create<arith::MaxFOp>(loc, self, result); return b.create<arith::MaximumFOp>(loc, self, result);
else if (resultElementType.isa<mlir::IntegerType>()) { else if (resultElementType.isa<mlir::IntegerType>()) {
IntegerType intType = max.getSelf() IntegerType intType = max.getSelf()
.getType() .getType()
@ -297,7 +297,7 @@ static Value createLinalgPayloadForReduceOp(OpBuilder &b, Location loc,
convertScalarToDtype(b, loc, payloadArgs[0], resultElementType); convertScalarToDtype(b, loc, payloadArgs[0], resultElementType);
Value result = payloadArgs[1]; Value result = payloadArgs[1];
if (resultElementType.isa<mlir::FloatType>()) if (resultElementType.isa<mlir::FloatType>())
return b.create<arith::MinFOp>(loc, self, result); return b.create<arith::MinimumFOp>(loc, self, result);
else if (resultElementType.isa<mlir::IntegerType>()) { else if (resultElementType.isa<mlir::IntegerType>()) {
IntegerType intType = min.getSelf() IntegerType intType = min.getSelf()
.getType() .getType()

4
lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp
View File

@ -1332,7 +1332,7 @@ public:
if (update.getType().isa<mlir::IntegerType>()) { if (update.getType().isa<mlir::IntegerType>()) {
result = b.create<arith::MaxSIOp>(loc, update, current); result = b.create<arith::MaxSIOp>(loc, update, current);
} else if (update.getType().isa<mlir::FloatType>()) { } else if (update.getType().isa<mlir::FloatType>()) {
result = b.create<arith::MaxFOp>(loc, update, current); result = b.create<arith::MaximumFOp>(loc, update, current);
} else { } else {
llvm_unreachable("Only integer/float types supported!"); llvm_unreachable("Only integer/float types supported!");
} }
@ -1340,7 +1340,7 @@ public:
if (update.getType().isa<mlir::IntegerType>()) { if (update.getType().isa<mlir::IntegerType>()) {
result = b.create<arith::MinSIOp>(loc, update, current); result = b.create<arith::MinSIOp>(loc, update, current);
} else if (update.getType().isa<mlir::FloatType>()) { } else if (update.getType().isa<mlir::FloatType>()) {
result = b.create<arith::MinFOp>(loc, update, current); result = b.create<arith::MinimumFOp>(loc, update, current);
} else { } else {
llvm_unreachable("Only integer/float types supported!"); llvm_unreachable("Only integer/float types supported!");
} }