OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[fir][NFC] Rename operand of ArrayCoorOp 

Rename `lenParams` to `typeparams` to be in sync with fir-dev.

This patch is part of the upstreaming effort from fir-dev branch.

Co-authored-by: Jean Perier <jperier@nvidia.com>
Co-authored-by: Valentin Clement <clementval@gmail.com>

Reviewed By: jeanPerier

Differential Revision: https://reviews.llvm.org/D110645
This commit is contained in:
Eric Schweitz 2021-09-29 10:30:54 +02:00 committed by Valentin Clement
parent ac2daacb31
commit 60527cee95
No known key found for this signature in database
GPG Key ID: 086D54783C928776
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flang/include/flang/Optimizer/Dialect/FIROps.td
View File

@ -1849,16 +1849,17 @@ def fir_ArrayCoorOp : fir_Op<"array_coor",
Optional<AnyShapeOrShiftType>:$shape, Optional<AnyShapeOrShiftType>:$shape,
Optional<fir_SliceType>:$slice, Optional<fir_SliceType>:$slice,
Variadic<AnyCoordinateType>:$indices, Variadic<AnyCoordinateType>:$indices,
Variadic<AnyIntegerType>:$lenParams Variadic<AnyIntegerType>:$typeparams
); );
let results = (outs fir_ReferenceType); let results = (outs fir_ReferenceType);
let assemblyFormat = [{ let assemblyFormat = [{
$memref (`(`$shape^`)`)? (`[`$slice^`]`)? $indices (`typeparams` $lenParams^)? attr-dict `:` functional-type(operands, results) $memref (`(`$shape^`)`)? (`[`$slice^`]`)? $indices (`typeparams`
$typeparams^)? attr-dict `:` functional-type(operands, results)
}]; }];
let verifier = [{ return ::verify(*this); }]; let verifier = "return ::verify(*this);";
} }
def fir_CoordinateOp : fir_Op<"coordinate_of", [NoSideEffect]> { def fir_CoordinateOp : fir_Op<"coordinate_of", [NoSideEffect]> {

2
flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
View File

@ -222,7 +222,7 @@ public:
} }
auto xArrCoor = rewriter.create<cg::XArrayCoorOp>( auto xArrCoor = rewriter.create<cg::XArrayCoorOp>(
loc, arrCoor.getType(), arrCoor.memref(), shapeOpers, shiftOpers, loc, arrCoor.getType(), arrCoor.memref(), shapeOpers, shiftOpers,
sliceOpers, subcompOpers, arrCoor.indices(), arrCoor.lenParams()); sliceOpers, subcompOpers, arrCoor.indices(), arrCoor.typeparams());
LLVM_DEBUG(llvm::dbgs() LLVM_DEBUG(llvm::dbgs()
<< "rewriting " << arrCoor << " to " << xArrCoor << '\n'); << "rewriting " << arrCoor << " to " << xArrCoor << '\n');
rewriter.replaceOp(arrCoor, xArrCoor.getOperation()->getResults()); rewriter.replaceOp(arrCoor, xArrCoor.getOperation()->getResults());