Skip to content

Commit 8014357

Browse files
committed
Resolve build failure caused by rebase from upstream.
1 parent 202c2ed commit 8014357

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

mlir/include/mlir/Dialect/OpenMP/OpenMPClauseOperands.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ struct SimdlenClauseOps {
189189
IntegerAttr simdlenAttr;
190190
};
191191

192+
struct TargetDeviceClauseOps {
193+
llvm::SmallVector<Value> isDevicePtrVars, hasDeviceAddrVars;
194+
};
195+
192196
struct TaskReductionClauseOps {
193197
llvm::SmallVector<Value> taskReductionVars;
194198
llvm::SmallVector<Attribute> taskReductionDeclSymbols;
@@ -257,7 +261,7 @@ using TargetClauseOps =
257261
detail::Clauses<AllocateClauseOps, DependClauseOps, DeviceClauseOps,
258262
IfClauseOps, InReductionClauseOps, MapClauseOps,
259263
NowaitClauseOps, PrivateClauseOps, ReductionClauseOps,
260-
ThreadLimitClauseOps>;
264+
TargetDeviceClauseOps, ThreadLimitClauseOps>;
261265

262266
using TargetDataClauseOps = detail::Clauses<DeviceClauseOps, IfClauseOps,
263267
MapClauseOps, UseDeviceClauseOps>;

mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,10 +1258,11 @@ void TargetOp::build(OpBuilder &builder, OperationState &state,
12581258
// TODO Store clauses in op: allocateVars, allocatorVars, inReductionVars,
12591259
// inReductionDeclSymbols, privateVars, privatizers, reductionVars,
12601260
// reductionByRefAttr, reductionDeclSymbols.
1261-
TargetOp::build(builder, state, clauses.ifVar, clauses.deviceVar,
1262-
clauses.threadLimitVar,
1263-
makeArrayAttr(ctx, clauses.dependTypeAttrs),
1264-
clauses.dependVars, clauses.nowaitAttr, clauses.mapVars);
1261+
TargetOp::build(
1262+
builder, state, clauses.ifVar, clauses.deviceVar, clauses.threadLimitVar,
1263+
makeArrayAttr(ctx, clauses.dependTypeAttrs), clauses.dependVars,
1264+
clauses.nowaitAttr, clauses.isDevicePtrVars, clauses.hasDeviceAddrVars,
1265+
clauses.mapVars);
12651266
}
12661267

12671268
LogicalResult TargetOp::verify() {

0 commit comments

Comments
 (0)