Skip to content

Commit b4da7b2

Browse files
authored
This patch integrates at 9c7727c62af0b366358df9e030f5cde659422eb2 and carries the revert: llvm/llvm-project@b4c31dc. --------- Signed-off-by: Fabian Mora <[email protected]>
1 parent 83789af commit b4da7b2

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

compiler/src/iree/compiler/Codegen/LLVMCPU/DispatchABI.cpp

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,15 @@ ExecutableLibraryDI::getArrayOf(LLVM::DITypeAttr typeAttr, int64_t count) {
149149
/*baseType=*/typeAttr, LLVM::DIFlags::Zero,
150150
/*sizeInBits=*/getDITypeSizeInBits(typeAttr) * count,
151151
/*alignInBits=*/0,
152+
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
153+
/*associated=*/nullptr,
154+
/*elements=*/
152155
{
153156
LLVM::DISubrangeAttr::get(
154157
builder.getContext(), builder.getI64IntegerAttr(count),
155158
/*lowerBound=*/nullptr, /*upperBound=*/nullptr,
156159
/*stride=*/nullptr),
157-
},
158-
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
159-
/*associated=*/nullptr);
160+
});
160161
}
161162

162163
LLVM::DIDerivedTypeAttr
@@ -226,11 +227,12 @@ LLVM::DICompositeTypeAttr ExecutableLibraryDI::getProcessorV0T() {
226227
/*line=*/227, fileAttr,
227228
/*baseType=*/nullptr, LLVM::DIFlags::Zero, /*sizeInBits=*/512,
228229
/*alignInBits=*/0,
230+
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
231+
/*associated=*/nullptr,
232+
/*elements=*/
229233
{
230234
getMemberOf("data", getArrayOf(getUint64T(), 8), &offsetInBits),
231-
},
232-
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
233-
/*associated=*/nullptr);
235+
});
234236
}
235237

236238
LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getEnvironmentV0T() {
@@ -244,6 +246,10 @@ LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getEnvironmentV0T() {
244246
/*line=*/246, fileAttr,
245247
/*baseType=*/nullptr, LLVM::DIFlags::Zero, /*sizeInBits=*/768,
246248
/*alignInBits=*/0,
249+
/*dataLocation=*/nullptr,
250+
/*rank=*/nullptr, /*allocated=*/nullptr,
251+
/*associated=*/nullptr,
252+
/*elements=*/
247253
{
248254
getMemberOf("constants",
249255
getPtrOf(getConstOf(getArrayOf(getUint32T(), 64))),
@@ -255,10 +261,7 @@ LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getEnvironmentV0T() {
255261
getPtrOf(getPtrOf(getConstOf(getVoidPtr()))),
256262
&offsetInBits),
257263
getMemberOf("processor", getProcessorV0T(), &offsetInBits),
258-
},
259-
/*dataLocation=*/nullptr,
260-
/*rank=*/nullptr, /*allocated=*/nullptr,
261-
/*associated=*/nullptr));
264+
}));
262265
}
263266

264267
LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getDispatchStateV0T() {
@@ -271,6 +274,9 @@ LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getDispatchStateV0T() {
271274
fileAttr, /*line=*/275, fileAttr,
272275
/*baseType=*/nullptr, LLVM::DIFlags::Zero, /*sizeInBits=*/384,
273276
/*alignInBits=*/0,
277+
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
278+
/*associated=*/nullptr,
279+
/*elements=*/
274280
{
275281
getMemberOf("workgroup_size_x", getUint32T(), &offsetInBits),
276282
getMemberOf("workgroup_size_y", getUint32T(), &offsetInBits),
@@ -291,9 +297,7 @@ LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getDispatchStateV0T() {
291297
getMemberOf("binding_lengths",
292298
getPtrOf(getConstOf(getArrayOf(getSizeT(), 64))),
293299
&offsetInBits),
294-
},
295-
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
296-
/*associated=*/nullptr));
300+
}));
297301
}
298302

299303
LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getWorkgroupStateV0T() {
@@ -306,6 +310,10 @@ LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getWorkgroupStateV0T() {
306310
fileAttr, /*line=*/321, fileAttr,
307311
/*baseType=*/nullptr, LLVM::DIFlags::Zero, /*sizeInBits=*/256,
308312
/*alignInBits=*/0,
313+
/*dataLocation=*/nullptr,
314+
/*rank=*/nullptr, /*allocated=*/nullptr,
315+
/*associated=*/nullptr,
316+
/*elements=*/
309317
{
310318
getMemberOf("workgroup_id_x", getUint32T(), &offsetInBits),
311319
getMemberOf("workgroup_id_y", getUint32T(), &offsetInBits),
@@ -314,9 +322,7 @@ LLVM::DIDerivedTypeAttr ExecutableLibraryDI::getWorkgroupStateV0T() {
314322
getMemberOf("processor_id", getUint32T(), &offsetInBits),
315323
getMemberOf("local_memory", getVoidPtr(), &offsetInBits),
316324
getMemberOf("local_memory_size", getUint32T(), &offsetInBits),
317-
},
318-
/*dataLocation=*/nullptr, /*rank=*/nullptr, /*allocated=*/nullptr,
319-
/*associated=*/nullptr));
325+
}));
320326
}
321327

322328
//------------------------------------------------------------------------------

third_party/llvm-project

Submodule llvm-project updated 417 files

0 commit comments

Comments
 (0)