[clang] 1a8817a - Reland "[flang][cuda][driver] Make sure flang does not switch to cc1 (#104613)"

Valentin Clement via cfe-commits cfe-commits at lists.llvm.org
Fri Aug 16 13:41:41 PDT 2024


Author: Valentin Clement (バレンタイン クレメン)
Date: 2024-08-16T13:41:24-07:00
New Revision: 1a8817aebe12b8d4708ee849fb8f792cffb7ae85

URL: https://github.com/llvm/llvm-project/commit/1a8817aebe12b8d4708ee849fb8f792cffb7ae85
DIFF: https://github.com/llvm/llvm-project/commit/1a8817aebe12b8d4708ee849fb8f792cffb7ae85.diff

LOG: Reland "[flang][cuda][driver] Make sure flang does not switch to cc1 (#104613)"

Flang is switch to cc1 when we use `-x cuda`. Make sure we can use fc1
with cuda fortran input.

The current pipeline will fail at MLIR level for the moment.

Added: 
    

Modified: 
    clang/lib/Driver/Types.cpp
    flang/test/Driver/cuda-option.f90

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/Types.cpp b/clang/lib/Driver/Types.cpp
index 2b9b391c19c9fd..3de45b00b4d00f 100644
--- a/clang/lib/Driver/Types.cpp
+++ b/clang/lib/Driver/Types.cpp
@@ -170,6 +170,9 @@ bool types::isAcceptedByFlang(ID Id) {
   case TY_LLVM_IR:
   case TY_LLVM_BC:
     return true;
+  case TY_PP_CUDA:
+  case TY_CUDA:
+    return true;
   }
 }
 

diff  --git a/flang/test/Driver/cuda-option.f90 b/flang/test/Driver/cuda-option.f90
index 562f8683b0ff7d..5dda307d44eddd 100644
--- a/flang/test/Driver/cuda-option.f90
+++ b/flang/test/Driver/cuda-option.f90
@@ -1,5 +1,6 @@
 ! Test -fcuda option
 ! RUN: %flang_fc1 -cpp -x cuda -fdebug-unparse %s -o - | FileCheck %s
+! RUN: %flang --target=x86_64-linux-gnu -cpp -fsyntax-only -x cuda %s -o -
 ! RUN: not %flang_fc1 -cpp %s -o - 2>&1 | FileCheck %s --check-prefix=ERROR
 program main
 #if _CUDA
@@ -12,4 +13,4 @@ program main
 ! CHECK: INTEGER :: var = 1
 ! CHECK: INTEGER, DEVICE :: dvar
 
-! ERROR: cuda-option.f90:8:19: error: expected end of statement
+! ERROR: cuda-option.f90:{{.*}}:{{.*}}: error: expected end of statement


        


More information about the cfe-commits mailing list