merge main into amd-staging

land and revert:
785a5b4 [MLIR][OpenMP] Add LLVM translation support for OpenMP UserDefinedMappers (llvm#124746)
d6ab12c [MLIR][OpenMP] Add conversion support from FIR to LLVM Dialect for OMP DeclareMapper (llvm#121005)
886b2ed [MLIR][OpenMP] Add Lowering support for OpenMP custom mappers in map clause (llvm#121001)
ee17955 [MLIR][OpenMP] Add OMP Mapper field to MapInfoOp (llvm#120994)

Author: ronlieb

flang/test/Lower/OpenMP/Todo/map-mapper.f90

@@ -0,0 +1,53 @@
+! Offloading test checking lowering of arrays with dynamic extents.
+! REQUIRES: flang, amdgpu
+
+! RUN: %libomptarget-compile-fortran-run-and-check-generic
+
+program test_openmp_mapper
+   implicit none
+   integer, parameter :: n = 1024
+   type :: mytype
+      integer :: data(n)
+   end type mytype
+
+   type :: mytype2
+      type(mytype) :: my_data
+   end type mytype2
+
+   ! Declare custom mappers for the derived type `mytype`
+   !$omp declare mapper(my_mapper1 : mytype :: t) map(to: t%data(1 : n))
+
+   ! Declare custom mappers for the derived type `mytype2`
+   !$omp declare mapper(my_mapper2 : mytype2 :: t) map(mapper(my_mapper1): t%my_data)
+
+   type(mytype2) :: obj
+   integer :: i, sum_host, sum_device
+
+   ! Initialize the host data
+   do i = 1, n
+      obj%my_data%data(i) = 1
+   end do
+
+   ! Compute the sum on the host for verification
+   sum_host = sum(obj%my_data%data)
+
+   ! Offload computation to the device using the named mapper `my_mapper2`
+   sum_device = 0
+   !$omp target map(tofrom: sum_device) map(mapper(my_mapper2) : obj)
+   do i = 1, n
+      sum_device = sum_device + obj%my_data%data(i)
+   end do
+   !$omp end target
+
+   ! Check results
+   print *, "Sum on host:    ", sum_host
+   print *, "Sum on device:  ", sum_device
+
+   if (sum_device == sum_host) then
+      print *, "Test passed!"
+   else
+      print *, "Test failed!"
+   end if
+ end program test_openmp_mapper
+
+! CHECK:  Test passed!

offload/test/offloading/fortran/target-custom-mapper.f90

@@ -7,7 +7,7 @@ Revert "Recommit "[InstCombine] Expand `foldSelectICmpAndOr` -> `foldSelectICmpA
     Backup fix for SWDEV-454675
     This reverts commit 54ec8bcaf
 contact: Selehov
-A revert is pending on gerrit
+b2659ca44 [InstCombine] Propagate flags in `foldSelectICmpAndBinOp` (#127437)
 ---
 breaks devicelibs
 6e0b0038 [clang][OpenCL][CodeGen][AMDGPU] Do not use `private` as the default AS for when `generic` is available (#112442)
@@ -31,3 +31,10 @@ Ron and Saiyed
 build/run issues: Scott Linder
 1083ec647f16 [reland][DebugInfo] Update DIBuilder insertion to take 
 ---
+conflicts flang/mlir : akash
+785a5b4676e7 [MLIR][OpenMP] Add LLVM translation support for OpenMP UserDefinedMappers (#124746)
+d6ab12c7cc70 [MLIR][OpenMP] Add conversion support from FIR to LLVM Dialect for OMP DeclareMapper (#121005)
+886b2edfbeea [MLIR][OpenMP] Add Lowering support for OpenMP custom mappers in map clause (#121001)
+ee17955dfe45 [MLIR][OpenMP] Add OMP Mapper field to MapInfoOp (#120994)
+
+---