Commit 2a1f1b5
authored
[OpenMP][OpenMPIRBuilder] Move copyInput to a passed in lambda function and re-order kernel argument load/stores (#68124)
This patch moves the existing copyInput function
into a lambda argument that can be defined
by a caller to the function.
This allows more flexibility in how the function
is defined, allowing Clang and MLIR to utilise
their own respective functions and types inside
of the lamba without affecting the OMPIRBuilder
itself.
The idea is to eventually replace/build on
the existing copyInput function that's used
and moved into OpenMPToLLVMIRTranslation.cpp
to a slightly more complex implementation
that uses MLIRs map information (primarily
ByRef and ByCapture information at the
moment).
The patch also moves kernel load stores to the top
of the kernel, prior to the first openmp runtime
invocation. Just makes the IR a little closer to Clang.1 parent 21030b9 commit 2a1f1b5
File tree
5 files changed
+163
-64
lines changed- llvm
- include/llvm/Frontend/OpenMP
- lib/Frontend/OpenMP
- unittests/Frontend
- mlir
- lib/Target/LLVMIR/Dialect/OpenMP
- test/Target/LLVMIR
5 files changed
+163
-64
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2166 | 2166 | | |
2167 | 2167 | | |
2168 | 2168 | | |
| 2169 | + | |
| 2170 | + | |
| 2171 | + | |
| 2172 | + | |
2169 | 2173 | | |
2170 | 2174 | | |
2171 | 2175 | | |
| |||
2177 | 2181 | | |
2178 | 2182 | | |
2179 | 2183 | | |
| 2184 | + | |
| 2185 | + | |
2180 | 2186 | | |
2181 | 2187 | | |
2182 | 2188 | | |
2183 | 2189 | | |
2184 | 2190 | | |
2185 | 2191 | | |
2186 | 2192 | | |
2187 | | - | |
| 2193 | + | |
| 2194 | + | |
2188 | 2195 | | |
2189 | 2196 | | |
2190 | 2197 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4539 | 4539 | | |
4540 | 4540 | | |
4541 | 4541 | | |
4542 | | - | |
4543 | | - | |
4544 | | - | |
4545 | | - | |
4546 | | - | |
4547 | | - | |
4548 | | - | |
4549 | | - | |
4550 | | - | |
4551 | | - | |
4552 | | - | |
4553 | | - | |
4554 | | - | |
4555 | | - | |
4556 | | - | |
4557 | | - | |
4558 | | - | |
4559 | | - | |
4560 | | - | |
| 4542 | + | |
| 4543 | + | |
| 4544 | + | |
| 4545 | + | |
| 4546 | + | |
4561 | 4547 | | |
4562 | 4548 | | |
4563 | 4549 | | |
| |||
4597 | 4583 | | |
4598 | 4584 | | |
4599 | 4585 | | |
4600 | | - | |
| 4586 | + | |
| 4587 | + | |
| 4588 | + | |
| 4589 | + | |
4601 | 4590 | | |
| 4591 | + | |
| 4592 | + | |
4602 | 4593 | | |
4603 | 4594 | | |
4604 | 4595 | | |
| 4596 | + | |
4605 | 4597 | | |
4606 | | - | |
4607 | | - | |
4608 | | - | |
4609 | | - | |
4610 | | - | |
4611 | | - | |
| 4598 | + | |
| 4599 | + | |
4612 | 4600 | | |
4613 | 4601 | | |
4614 | 4602 | | |
| |||
4623 | 4611 | | |
4624 | 4612 | | |
4625 | 4613 | | |
4626 | | - | |
4627 | | - | |
4628 | | - | |
4629 | | - | |
4630 | | - | |
4631 | | - | |
4632 | | - | |
| 4614 | + | |
| 4615 | + | |
| 4616 | + | |
| 4617 | + | |
| 4618 | + | |
| 4619 | + | |
| 4620 | + | |
4633 | 4621 | | |
4634 | 4622 | | |
4635 | | - | |
| 4623 | + | |
| 4624 | + | |
4636 | 4625 | | |
4637 | | - | |
| 4626 | + | |
4638 | 4627 | | |
4639 | 4628 | | |
4640 | 4629 | | |
| |||
4698 | 4687 | | |
4699 | 4688 | | |
4700 | 4689 | | |
4701 | | - | |
| 4690 | + | |
| 4691 | + | |
| 4692 | + | |
4702 | 4693 | | |
4703 | 4694 | | |
4704 | 4695 | | |
| |||
4707 | 4698 | | |
4708 | 4699 | | |
4709 | 4700 | | |
4710 | | - | |
| 4701 | + | |
| 4702 | + | |
4711 | 4703 | | |
4712 | 4704 | | |
4713 | 4705 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5236 | 5236 | | |
5237 | 5237 | | |
5238 | 5238 | | |
| 5239 | + | |
| 5240 | + | |
| 5241 | + | |
| 5242 | + | |
| 5243 | + | |
| 5244 | + | |
| 5245 | + | |
| 5246 | + | |
| 5247 | + | |
| 5248 | + | |
| 5249 | + | |
| 5250 | + | |
| 5251 | + | |
| 5252 | + | |
| 5253 | + | |
| 5254 | + | |
| 5255 | + | |
| 5256 | + | |
| 5257 | + | |
| 5258 | + | |
| 5259 | + | |
| 5260 | + | |
| 5261 | + | |
| 5262 | + | |
| 5263 | + | |
| 5264 | + | |
| 5265 | + | |
5239 | 5266 | | |
5240 | 5267 | | |
5241 | 5268 | | |
| |||
5245 | 5272 | | |
5246 | 5273 | | |
5247 | 5274 | | |
5248 | | - | |
5249 | | - | |
5250 | | - | |
| 5275 | + | |
| 5276 | + | |
| 5277 | + | |
5251 | 5278 | | |
5252 | 5279 | | |
5253 | 5280 | | |
| |||
5301 | 5328 | | |
5302 | 5329 | | |
5303 | 5330 | | |
| 5331 | + | |
| 5332 | + | |
| 5333 | + | |
| 5334 | + | |
| 5335 | + | |
| 5336 | + | |
| 5337 | + | |
| 5338 | + | |
| 5339 | + | |
| 5340 | + | |
| 5341 | + | |
| 5342 | + | |
| 5343 | + | |
| 5344 | + | |
| 5345 | + | |
| 5346 | + | |
| 5347 | + | |
| 5348 | + | |
| 5349 | + | |
| 5350 | + | |
| 5351 | + | |
| 5352 | + | |
| 5353 | + | |
| 5354 | + | |
| 5355 | + | |
| 5356 | + | |
| 5357 | + | |
5304 | 5358 | | |
5305 | 5359 | | |
5306 | 5360 | | |
| |||
5322 | 5376 | | |
5323 | 5377 | | |
5324 | 5378 | | |
5325 | | - | |
5326 | | - | |
5327 | | - | |
| 5379 | + | |
| 5380 | + | |
| 5381 | + | |
| 5382 | + | |
5328 | 5383 | | |
5329 | 5384 | | |
5330 | 5385 | | |
| |||
5343 | 5398 | | |
5344 | 5399 | | |
5345 | 5400 | | |
5346 | | - | |
5347 | | - | |
| 5401 | + | |
| 5402 | + | |
| 5403 | + | |
| 5404 | + | |
| 5405 | + | |
| 5406 | + | |
| 5407 | + | |
| 5408 | + | |
| 5409 | + | |
| 5410 | + | |
5348 | 5411 | | |
5349 | | - | |
| 5412 | + | |
5350 | 5413 | | |
5351 | 5414 | | |
5352 | 5415 | | |
| |||
5370 | 5433 | | |
5371 | 5434 | | |
5372 | 5435 | | |
5373 | | - | |
5374 | | - | |
5375 | | - | |
5376 | | - | |
5377 | | - | |
| 5436 | + | |
5378 | 5437 | | |
5379 | | - | |
5380 | | - | |
5381 | | - | |
5382 | | - | |
5383 | | - | |
| 5438 | + | |
5384 | 5439 | | |
5385 | 5440 | | |
5386 | 5441 | | |
| |||
Lines changed: 46 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2018 | 2018 | | |
2019 | 2019 | | |
2020 | 2020 | | |
| 2021 | + | |
| 2022 | + | |
| 2023 | + | |
| 2024 | + | |
| 2025 | + | |
| 2026 | + | |
| 2027 | + | |
| 2028 | + | |
| 2029 | + | |
| 2030 | + | |
| 2031 | + | |
| 2032 | + | |
| 2033 | + | |
| 2034 | + | |
| 2035 | + | |
| 2036 | + | |
| 2037 | + | |
| 2038 | + | |
| 2039 | + | |
| 2040 | + | |
| 2041 | + | |
| 2042 | + | |
| 2043 | + | |
| 2044 | + | |
| 2045 | + | |
2021 | 2046 | | |
2022 | 2047 | | |
2023 | 2048 | | |
| |||
2109 | 2134 | | |
2110 | 2135 | | |
2111 | 2136 | | |
| 2137 | + | |
| 2138 | + | |
| 2139 | + | |
| 2140 | + | |
| 2141 | + | |
| 2142 | + | |
| 2143 | + | |
| 2144 | + | |
| 2145 | + | |
| 2146 | + | |
| 2147 | + | |
| 2148 | + | |
| 2149 | + | |
| 2150 | + | |
| 2151 | + | |
| 2152 | + | |
| 2153 | + | |
| 2154 | + | |
| 2155 | + | |
| 2156 | + | |
2112 | 2157 | | |
2113 | 2158 | | |
2114 | | - | |
| 2159 | + | |
2115 | 2160 | | |
2116 | 2161 | | |
2117 | 2162 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | 34 | | |
39 | 35 | | |
40 | | - | |
41 | 36 | | |
42 | 37 | | |
43 | | - | |
44 | 38 | | |
45 | 39 | | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
0 commit comments