Merge branch 'main' into breakpoint-add

Author: jimingham

.ci/premerge_advisor_explain.py

@@ -129,7 +129,8 @@ def main(
         # If the job succeeds and there is not an existing comment, we
         # should not write one to reduce noise.
         comments = []
-    with open("comments", "w") as comment_file_handle:
+    comments_file_name = f"comments-{platform.system()}-{platform.machine()}"
+    with open(comments_file_name, "w") as comment_file_handle:
         json.dump(comments, comment_file_handle)
 
 

.github/workflows/premerge.yaml

@@ -124,9 +124,9 @@ jobs:
         if: ${{ always() && !startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') }}
         continue-on-error: true
         with:
-          name: workflow-args
+          name: workflow-args-x86-linux
           path: |
-            comments
+            comments-Linux-x86_64
 
   premerge-checks-windows:
     name: Build and Test Windows
@@ -185,6 +185,14 @@ jobs:
           path: artifacts/
           retention-days: 5
           include-hidden-files: 'true'
+      - name: Upload Comment
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        if: always()
+        continue-on-error: true
+        with:
+          name: workflow-args-windows
+          path: |
+            comments-Windows-x86_64
 
   premerge-check-macos:
     name: MacOS Premerge Checks

flang/test/Lower/OpenMP/Todo/reduction-task.f90

@@ -8,5 +8,5 @@ subroutine reduction_task()
 
   !$omp parallel reduction(task, +:i)
   i = i + 1
-  !$omp end parallel 
+  !$omp end parallel
 end subroutine reduction_task

flang/test/Lower/OpenMP/allocatable-array-bounds.f90

@@ -47,7 +47,7 @@
 subroutine read_write_section()
     integer, allocatable :: sp_read(:)
     integer, allocatable :: sp_write(:)
-    allocate(sp_read(10)) 
+    allocate(sp_read(10))
     allocate(sp_write(10))
     sp_write = (/0,0,0,0,0,0,0,0,0,0/)
     sp_read = (/1,2,3,4,5,6,7,8,9,10/)

flang/test/Lower/OpenMP/allocatable-map.f90

@@ -6,7 +6,7 @@
 !HLFIRDIALECT: %[[POINTER_MAP:.*]] = omp.map.info var_ptr(%[[POINTER]]#1 : !fir.ref<!fir.box<!fir.ptr<i32>>>, !fir.box<!fir.ptr<i32>>) map_clauses(always, to) capture(ByRef) members(%[[POINTER_MAP_MEMBER]] : [0] : !fir.llvm_ptr<!fir.ref<i32>>) -> !fir.ref<!fir.box<!fir.ptr<i32>>> {name = "point"}
 !HLFIRDIALECT: omp.target map_entries(%[[POINTER_MAP]] -> {{.*}}, %[[POINTER_MAP_MEMBER]] -> {{.*}} : !fir.ref<!fir.box<!fir.ptr<i32>>>, !fir.llvm_ptr<!fir.ref<i32>>) {
 subroutine pointer_routine()
-    integer, pointer :: point 
+    integer, pointer :: point
 !$omp target map(tofrom:point)
     point = 1
 !$omp end target

flang/test/Lower/OpenMP/atomic-capture.f90

@@ -7,7 +7,7 @@
 
 
 program OmpAtomicCapture
-    use omp_lib                                                                                                       
+    use omp_lib
 
 !CHECK: %[[VAL_X_ALLOCA:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"}
 !CHECK: %[[VAL_X_DECLARE:.*]]:2 = hlfir.declare %[[VAL_X_ALLOCA]] {{.*}}
@@ -25,7 +25,7 @@ program OmpAtomicCapture
 !CHECK: omp.atomic.read %[[VAL_X_DECLARE]]#0 = %[[VAL_Y_DECLARE]]#0 : !fir.ref<i32>, !fir.ref<i32>, i32
 !CHECK: }
     !$omp atomic hint(omp_sync_hint_uncontended) capture
-        y = x * y 
+        y = x * y
         x = y
     !$omp end atomic
 
@@ -43,7 +43,7 @@ program OmpAtomicCapture
 !CHECK: }
     !$omp atomic hint(omp_lock_hint_nonspeculative) capture acquire
         x = y
-        y = 2 * 10 + (8 - x) 
+        y = 2 * 10 + (8 - x)
     !$omp end atomic
 end program
 

flang/test/Lower/OpenMP/atomic-read-complex.f90

@@ -15,7 +15,7 @@ program atomic_read_complex
   complex(4) :: c41, c42
   ! Test complex(8) - double precision (16 bytes)
   complex(8) :: c81, c82
-  
+
   c42 = (1.0_4, 1.0_4)
   c82 = (1.0_8, 1.0_8)
 
@@ -25,7 +25,7 @@ program atomic_read_complex
   ! CHECK: call void @__atomic_load(i64 8, ptr {{.*}}, ptr {{.*}}, i32 {{.*}})
 !$omp atomic read
   c41 = c42
-  
+
   ! Double precision complex: 16 bytes (this was broken before the fix)
   ! CHECK: call void @__atomic_load(i64 16, ptr {{.*}}, ptr {{.*}}, i32 {{.*}})
 !$omp atomic read

flang/test/Lower/OpenMP/atomic-update.f90

@@ -73,15 +73,15 @@ program OmpAtomicUpdate
 !CHECK: omp.yield(%[[TEMP]] : i32)
 !CHECK: }
    !$omp atomic update
-        a = a + b 
+        a = a + b
 
 !CHECK: %[[VAL_c1:.*]] = arith.constant 1 : i32
 !CHECK: omp.atomic.update %[[VAL_Y_DECLARE]]#0 : !fir.ref<i32> {
 !CHECK: ^bb0(%[[ARG:.*]]: i32):
 !CHECK: %[[TEMP:.*]] = arith.addi %[[ARG]], %[[VAL_c1]] : i32
 !CHECK: omp.yield(%[[TEMP]] : i32)
 !CHECK: }
-   !$omp atomic 
+   !$omp atomic
         y = y + 1
 
 !CHECK: %[[VAL_X_LOADED:.*]] = fir.load %[[VAL_X_DECLARE]]#0 : !fir.ref<i32>
@@ -91,7 +91,7 @@ program OmpAtomicUpdate
 !CHECK: omp.yield(%[[TEMP]] : i32)
 !CHECK: }
     !$omp atomic update
-        z = x * z 
+        z = x * z
 
 !CHECK: %[[VAL_c1:.*]] = arith.constant 1 : i32
 !CHECK: omp.atomic.update hint(uncontended) memory_order(relaxed) %[[VAL_X_DECLARE]]#0 : !fir.ref<i32> {
@@ -110,7 +110,7 @@ program OmpAtomicUpdate
 !CHECK:  %[[TEMP:.*]] = arith.select {{.*}} : i32
 !CHECK:  omp.yield(%[[TEMP]] : i32)
 !CHECK: }
-    !$omp atomic update relaxed 
+    !$omp atomic update relaxed
         y = max(y, c, d)
 
 !CHECK: %[[VAL_X_LOADED:.*]] = fir.load %[[VAL_X_DECLARE]]#0 : !fir.ref<i32>
@@ -211,7 +211,7 @@ program OmpAtomicUpdate
 !CHECK: %[[RESULT:.*]] = fir.convert %[[EXT]] : (f32) -> i32
 !CHECK: omp.yield(%[[RESULT]] : i32)
   !$omp atomic update
-    w = w + g  
+    w = w + g
 end program OmpAtomicUpdate
 
 ! Check that the clean-ups associated with the function call

flang/test/Lower/OpenMP/atomic-write-complex.f90

@@ -13,19 +13,19 @@ program atomic_write_complex
 
   ! Test complex(4) - single precision (8 bytes)
   complex(4) :: c41, c42
-  ! Test complex(8) - double precision (16 bytes)  
+  ! Test complex(8) - double precision (16 bytes)
   complex(8) :: c81, c82
-  
+
   c42 = (1.0_4, 1.0_4)
   c82 = (1.0_8, 1.0_8)
 
   ! CHECK-LABEL: define {{.*}} @_QQmain
-  
+
   ! Single precision complex: 8 bytes
   ! CHECK: call void @__atomic_store(i64 8, ptr {{.*}}, ptr {{.*}}, i32 {{.*}})
 !$omp atomic write
   c41 = c42
-  
+
   ! Double precision complex: 16 bytes (this was broken before the fix)
   ! CHECK: call void @__atomic_store(i64 16, ptr {{.*}}, ptr {{.*}}, i32 {{.*}})
 !$omp atomic write

flang/test/Lower/OpenMP/copyin.f90

@@ -335,7 +335,7 @@ subroutine common_2()
   integer :: y
   common /d/ x, y
   !$omp threadprivate(/d/)
-  
+
   !$omp parallel do copyin(/d/)
      do i = 1, x
         y = y + i