[flang-commits] [flang] Revert "[flang][cuda] Add c_devptr and bypass output semantic check" (PR #107349)
Valentin Clement バレンタイン クレメン via flang-commits
flang-commits at lists.llvm.org
Wed Sep 4 21:15:47 PDT 2024
https://github.com/clementval created https://github.com/llvm/llvm-project/pull/107349
Reverts llvm/llvm-project#107318
It breaks a test https://lab.llvm.org/buildbot/#/builders/143/builds/1933
>From 77500cdd0c7894cddbf89210597982c4e06a5331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Clement=20=28=E3=83=90=E3=83=AC=E3=83=B3?=
=?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=B3=20=E3=82=AF=E3=83=AC=E3=83=A1?=
=?UTF-8?q?=E3=83=B3=29?= <clementval at gmail.com>
Date: Wed, 4 Sep 2024 21:15:23 -0700
Subject: [PATCH] Revert "[flang][cuda] Add c_devptr and bypass output semantic
check (#107318)"
This reverts commit c2fc33204caca8c52b27425255bbc78c9e4d99e4.
---
flang/lib/Semantics/check-io.cpp | 5 -----
flang/module/__fortran_builtins.f90 | 4 ----
flang/test/Lower/CUDA/cuda-devptr.cuf | 16 ----------------
3 files changed, 25 deletions(-)
delete mode 100644 flang/test/Lower/CUDA/cuda-devptr.cuf
diff --git a/flang/lib/Semantics/check-io.cpp b/flang/lib/Semantics/check-io.cpp
index d7d2f0fa322cbb..54e8e09cbf7e48 100644
--- a/flang/lib/Semantics/check-io.cpp
+++ b/flang/lib/Semantics/check-io.cpp
@@ -1171,11 +1171,6 @@ parser::Message *IoChecker::CheckForBadIoType(const evaluate::DynamicType &type,
"Derived type '%s' in I/O may not be polymorphic unless using defined I/O"_err_en_US,
derived.name());
}
- if (IsBuiltinDerivedType(&derived, "c_ptr") ||
- IsBuiltinDerivedType(&derived, "c_devptr")) {
- // Bypass the check below for c_ptr and c_devptr.
- return nullptr;
- }
if (const Symbol *
bad{FindInaccessibleComponent(which, derived, scope)}) {
return &context_.Say(where,
diff --git a/flang/module/__fortran_builtins.f90 b/flang/module/__fortran_builtins.f90
index a9d3ac897eb583..44b0f17339cd96 100644
--- a/flang/module/__fortran_builtins.f90
+++ b/flang/module/__fortran_builtins.f90
@@ -102,10 +102,6 @@
__builtin_threadIdx, __builtin_blockDim, __builtin_blockIdx, &
__builtin_gridDim
integer, parameter, public :: __builtin_warpsize = 32
-
- type, public, bind(c) :: __builtin_c_devptr
- type(__builtin_c_ptr) :: cptr
- end type
intrinsic :: __builtin_fma
intrinsic :: __builtin_ieee_is_nan, __builtin_ieee_is_negative, &
diff --git a/flang/test/Lower/CUDA/cuda-devptr.cuf b/flang/test/Lower/CUDA/cuda-devptr.cuf
deleted file mode 100644
index 4e11e3c0fc8f85..00000000000000
--- a/flang/test/Lower/CUDA/cuda-devptr.cuf
+++ /dev/null
@@ -1,16 +0,0 @@
-! RUN: bbc -emit-hlfir -fcuda %s -o - | FileCheck %s
-
-! Test CUDA Fortran specific type
-
-subroutine sub1()
- use iso_c_binding
- use __fortran_builtins, only : c_devptr => __builtin_c_devptr
-
- type(c_ptr) :: ptr
- type(c_devptr) :: dptr
- print*,ptr
- print*,dptr
-end
-
-! CHECK-LABEL: func.func @_QPsub1()
-! CHECK-COUNT-2: %{{.*}} = fir.call @_FortranAioOutputDerivedType
More information about the flang-commits
mailing list