Skip to content

Commit ba04503

Browse files
committed
merge main into amd-staging
lands and reverts f117881 [Flang][OpenMP][MLIR] Implement close, present and ompx_ho
2 parents af6a570 + f117881 commit ba04503

File tree

6 files changed

+3
-58
lines changed

6 files changed

+3
-58
lines changed

flang/test/Lower/OpenMP/Todo/from-expectation-modifier.f90

Lines changed: 0 additions & 8 deletions
This file was deleted.

flang/test/Lower/OpenMP/Todo/map-modifiers-close.f90

Lines changed: 0 additions & 10 deletions
This file was deleted.

flang/test/Lower/OpenMP/Todo/map-modifiers-ompxhold.f90

Lines changed: 0 additions & 11 deletions
This file was deleted.

flang/test/Lower/OpenMP/Todo/map-modifiers-present.f90

Lines changed: 0 additions & 11 deletions
This file was deleted.

flang/test/Lower/OpenMP/Todo/to-expectation-modifier.f90

Lines changed: 0 additions & 8 deletions
This file was deleted.

revert_patches.txt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,14 @@ breaks build of hipRuntime
1313
51ad2901ca54 [Clang] Improve diagnostic on `[[nodiscard]]` attribute (#112521)
1414
Ron, Maneesh
1515
---
16-
Revert: breaks build of rocFFT
17-
854d7301f989 [Clang/AMDGPU] Zero sized arrays not allowed in HIP device code. (#113470)
18-
Brendon and Vigneshwar
19-
---
2016
revert: breaks rocBLAS build
2117
d57230c7 [AMDGPU][MC] Disallow op_sel in some VOP3P dot instructions (#100485)
2218
---
2319
revert: breaks build of rccl __cpuidex
2420
1c28b92373 [Clang] __has_builtin should return false for aux triple builtins (#121839)
2521
Ron and Saiyed
2622
---
27-
a3165398db07 AMDGPU: Fix overly conservative immediate operand check
28-
Matt
29-
---
30-
needs spriv fix etc ...
31-
979c275097a6 [IR] Store Triple in Module (NFC) (#129868)
32-
Alex and Ron
23+
needs flang help
24+
f1178815d243 [Flang][OpenMP][MLIR] Implement close, present and ompx_ho
25+
AndrewG
3326
---

0 commit comments

Comments
 (0)