Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[flang] Add comparison operators for c_devptr (#192687)

Browse source
This commit is contained in:
nvptm 2026-04-23 15:13:34 -07:00 committed by GitHub
parent 464392e9d3
commit 8b96c2104e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 90 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flang/lib/Optimizer/Builder/IntrinsicCall.cpp
View file

@ -182,6 +182,8 @@ static constexpr IntrinsicHandler handlers[]{
{{{"c_ptr_1", asAddr}, {"c_ptr_2", asAddr, handleDynamicOptional}}},
/*isElemental=*/false},
{"c_devloc", &I::genCDevLoc, {{{"x", asBox}}}, /*isElemental=*/false},
{"c_devptr_eq", &I::genCPtrCompare<mlir::arith::CmpIPredicate::eq>},
{"c_devptr_ne", &I::genCPtrCompare<mlir::arith::CmpIPredicate::ne>},
{"c_f_pointer",
&I::genCFPointer,
{{{"cptr", asValue},
@ -3380,7 +3382,7 @@ IntrinsicLibrary::genCLoc(mlir::Type resultType,
return genCLocOrCFunLoc(builder, loc, resultType, args);
}
// C_PTR_EQ and C_PTR_NE
// C_PTR_EQ / C_PTR_NE and C_DEVPTR_EQ / C_DEVPTR_NE
template <mlir::arith::CmpIPredicate pred>
fir::ExtendedValue
IntrinsicLibrary::genCPtrCompare(mlir::Type resultType,

15
flang/module/__fortran_builtins.f90
View file

@ -168,11 +168,13 @@ module __fortran_builtins
interface operator(==)
module procedure __builtin_c_ptr_eq
module procedure __builtin_c_devptr_eq
end interface
public :: operator(==)
interface operator(/=)
module procedure __builtin_c_ptr_ne
module procedure __builtin_c_devptr_ne
end interface
public :: operator(/=)
@ -184,11 +186,14 @@ module __fortran_builtins
! private :: c_associated_c_ptr, c_associated_c_funptr
type(__builtin_c_ptr), parameter, public :: __builtin_c_null_ptr = __builtin_c_ptr(0)
type(__builtin_c_devptr), parameter, public :: __builtin_c_null_devptr = __builtin_c_devptr(__builtin_c_null_ptr)
type(__builtin_c_funptr), parameter, public :: &
__builtin_c_null_funptr = __builtin_c_funptr(0)
public :: __builtin_c_ptr_eq
public :: __builtin_c_ptr_ne
public :: __builtin_c_devptr_eq
public :: __builtin_c_devptr_ne
public :: __builtin_c_funloc
contains
@ -203,6 +208,16 @@ module __fortran_builtins
__builtin_c_ptr_ne = x%__address /= y%__address
end function
elemental logical function __builtin_c_devptr_eq(x, y)
type(__builtin_c_devptr), intent(in) :: x, y
__builtin_c_devptr_eq = x%cptr == y%cptr
end function
elemental logical function __builtin_c_devptr_ne(x, y)
type(__builtin_c_devptr), intent(in) :: x, y
__builtin_c_devptr_ne = x%cptr /= y%cptr
end function
! Semantics has some special-case code that allows c_funloc()
! to appear in a specification expression and exempts it
! from the requirement that "x" be a pure dummy procedure.

58
flang/test/Lower/Intrinsics/c_devptr_eq_ne.f90 Normal file
View file

@ -0,0 +1,58 @@
! Test C_DEVPTR_EQ and C_DEVPTR_NE lowering.
! RUN: bbc -emit-hlfir -o - %s | FileCheck %s
function test_c_devptr_eq(d1, d2)
use __fortran_builtins, only: &
c_devptr => __builtin_c_devptr, operator(==), operator(/=)
type(c_devptr), intent(in) :: d1, d2
logical :: test_c_devptr_eq
test_c_devptr_eq = (d1 .eq. d2)
end
! CHECK-LABEL: func.func @_QPtest_c_devptr_eq(
! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>> {fir.bindc_name = "d1"}, %[[ARG1:.*]]: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>> {fir.bindc_name = "d2"}) -> !fir.logical<4> {
! CHECK: %[[DECL_ARG0:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {fortran_attrs = #fir.var_attrs<intent_in>, uniq_name = "_QFtest_c_devptr_eqEd1"} : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.dscope) -> (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>)
! CHECK: %[[DECL_ARG1:.*]]:2 = hlfir.declare %[[ARG1]] dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {fortran_attrs = #fir.var_attrs<intent_in>, uniq_name = "_QFtest_c_devptr_eqEd2"} : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.dscope) -> (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>)
! CHECK: %[[ALLOCA:.*]] = fir.alloca !fir.logical<4> {bindc_name = "test_c_devptr_eq", uniq_name = "_QFtest_c_devptr_eqEtest_c_devptr_eq"}
! CHECK: %[[DECL_RET:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "_QFtest_c_devptr_eqEtest_c_devptr_eq"} : (!fir.ref<!fir.logical<4>>) -> (!fir.ref<!fir.logical<4>>, !fir.ref<!fir.logical<4>>)
! CHECK: %[[COORD_CPTR0:.*]] = fir.coordinate_of %[[DECL_ARG0]]#0, cptr : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>) -> !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>
! CHECK: %[[COORD_ADDRESS0:.*]] = fir.coordinate_of %[[COORD_CPTR0]], __address : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) -> !fir.ref<i64>
! CHECK: %[[ADDRESS0:.*]] = fir.load %[[COORD_ADDRESS0]] : !fir.ref<i64>
! CHECK: %[[COORD_CPTR1:.*]] = fir.coordinate_of %[[DECL_ARG1]]#0, cptr : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>) -> !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>
! CHECK: %[[COORD_ADDRESS1:.*]] = fir.coordinate_of %[[COORD_CPTR1]], __address : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) -> !fir.ref<i64>
! CHECK: %[[ADDRESS1:.*]] = fir.load %[[COORD_ADDRESS1]] : !fir.ref<i64>
! CHECK: %[[CMP:.*]] = arith.cmpi eq, %[[ADDRESS0]], %[[ADDRESS1]] : i64
! CHECK: %[[RES:.*]] = fir.convert %[[CMP]] : (i1) -> !fir.logical<4>
! CHECK: %[[NO_REASSOC_RES:.*]] = hlfir.no_reassoc %[[RES]] : !fir.logical<4>
! CHECK: hlfir.assign %[[NO_REASSOC_RES]] to %[[DECL_RET]]#0 : !fir.logical<4>, !fir.ref<!fir.logical<4>>
! CHECK: %[[LOAD_RET:.*]] = fir.load %[[DECL_RET]]#0 : !fir.ref<!fir.logical<4>>
! CHECK: return %[[LOAD_RET]] : !fir.logical<4>
! CHECK: }
function test_c_devptr_ne(d1, d2)
use __fortran_builtins, only: &
c_devptr => __builtin_c_devptr, operator(==), operator(/=)
type(c_devptr), intent(in) :: d1, d2
logical :: test_c_devptr_ne
test_c_devptr_ne = (d1 .ne. d2)
end
! CHECK-LABEL: func.func @_QPtest_c_devptr_ne(
! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>> {fir.bindc_name = "d1"}, %[[ARG1:.*]]: !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>> {fir.bindc_name = "d2"}) -> !fir.logical<4> {
! CHECK: %[[DECL_ARG0:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {fortran_attrs = #fir.var_attrs<intent_in>, uniq_name = "_QFtest_c_devptr_neEd1"} : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.dscope) -> (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>)
! CHECK: %[[DECL_ARG1:.*]]:2 = hlfir.declare %[[ARG1]] dummy_scope %{{[0-9]+}} arg {{[0-9]+}} {fortran_attrs = #fir.var_attrs<intent_in>, uniq_name = "_QFtest_c_devptr_neEd2"} : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.dscope) -> (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>, !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>)
! CHECK: %[[ALLOCA:.*]] = fir.alloca !fir.logical<4> {bindc_name = "test_c_devptr_ne", uniq_name = "_QFtest_c_devptr_neEtest_c_devptr_ne"}
! CHECK: %[[DECL_RET:.*]]:2 = hlfir.declare %[[ALLOCA]] {uniq_name = "_QFtest_c_devptr_neEtest_c_devptr_ne"} : (!fir.ref<!fir.logical<4>>) -> (!fir.ref<!fir.logical<4>>, !fir.ref<!fir.logical<4>>)
! CHECK: %[[COORD_CPTR0:.*]] = fir.coordinate_of %[[DECL_ARG0]]#0, cptr : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>) -> !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>
! CHECK: %[[COORD_ADDRESS0:.*]] = fir.coordinate_of %[[COORD_CPTR0]], __address : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) -> !fir.ref<i64>
! CHECK: %[[ADDRESS0:.*]] = fir.load %[[COORD_ADDRESS0]] : !fir.ref<i64>
! CHECK: %[[COORD_CPTR1:.*]] = fir.coordinate_of %[[DECL_ARG1]]#0, cptr : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_devptr{cptr:!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>}>>) -> !fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>
! CHECK: %[[COORD_ADDRESS1:.*]] = fir.coordinate_of %[[COORD_CPTR1]], __address : (!fir.ref<!fir.type<_QM__fortran_builtinsT__builtin_c_ptr{__address:i64}>>) -> !fir.ref<i64>
! CHECK: %[[ADDRESS1:.*]] = fir.load %[[COORD_ADDRESS1]] : !fir.ref<i64>
! CHECK: %[[CMP:.*]] = arith.cmpi ne, %[[ADDRESS0]], %[[ADDRESS1]] : i64
! CHECK: %[[RES:.*]] = fir.convert %[[CMP]] : (i1) -> !fir.logical<4>
! CHECK: %[[NO_REASSOC_RES:.*]] = hlfir.no_reassoc %[[RES]] : !fir.logical<4>
! CHECK: hlfir.assign %[[NO_REASSOC_RES]] to %[[DECL_RET]]#0 : !fir.logical<4>, !fir.ref<!fir.logical<4>>
! CHECK: %[[LOAD_RET:.*]] = fir.load %[[DECL_RET]]#0 : !fir.ref<!fir.logical<4>>
! CHECK: return %[[LOAD_RET]] : !fir.logical<4>
! CHECK: }

15
openmp/module/CMakeLists.txt
View file

@ -29,11 +29,24 @@ if (LIBOMP_FORTRAN_MODULES_COMPILER)
# compile the Fortran module files.
message(STATUS "configuring openmp to build Fortran module files using '${LIBOMP_FORTRAN_MODULES_COMPILER}'")
set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90)
# omp_lib_kinds uses iso_c_binding, which depends on these intrinsic modules.
# List them so omp_lib.mod is regenerated when intrinsic modules change; otherwise
# stale omp_lib.mod can reference an incompatible iso_c_binding.mod (see flang
# tests that load omp_lib.mod with -J).
set(_libomp_flang_intrinsic_mod_deps "")
if(LLVM_BINARY_DIR)
set(_flang_intrinsic_mod_dir "${LLVM_BINARY_DIR}/include/flang")
list(APPEND _libomp_flang_intrinsic_mod_deps
"${_flang_intrinsic_mod_dir}/__fortran_builtins.mod"
"${_flang_intrinsic_mod_dir}/__fortran_type_info.mod"
"${_flang_intrinsic_mod_dir}/iso_c_binding.mod"
)
endif()
add_custom_target(libomp-mod ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src/omp_lib.mod" "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src/omp_lib_kinds.mod")
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src/omp_lib.mod" "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src/omp_lib_kinds.mod"
COMMAND ${LIBOMP_FORTRAN_MODULES_COMPILER} -cpp -fsyntax-only ${LIBOMP_FORTRAN_SOURCE_FILE} "-J${CMAKE_CURRENT_BINARY_DIR}/../runtime/src"
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${LIBOMP_FORTRAN_SOURCE_FILE}"
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${LIBOMP_FORTRAN_SOURCE_FILE}" ${_libomp_flang_intrinsic_mod_deps}
)
set(BUILD_FORTRAN_MODULES True)
elseif (LIBOMP_FORTRAN_MODULES)