Author: Valentin Clement (バレンタイン クレメン) Date: 2024-08-16T12:02:25-07:00 New Revision: cf8d13e27b647afaca66457d93b45a7da0e9cdfb
URL: https://github.com/llvm/llvm-project/commit/cf8d13e27b647afaca66457d93b45a7da0e9cdfb DIFF: https://github.com/llvm/llvm-project/commit/cf8d13e27b647afaca66457d93b45a7da0e9cdfb.diff LOG: Revert "[flang][cuda][driver] Make sure flang does not switch to cc1 (#104613)" This reverts commit e6b9f12b0ac0f1e6f7f7145719092c10731e4fe4. 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 3de45b00b4d00f..2b9b391c19c9fd 100644 --- a/clang/lib/Driver/Types.cpp +++ b/clang/lib/Driver/Types.cpp @@ -170,9 +170,6 @@ 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 591d7d070d3a85..562f8683b0ff7d 100644 --- a/flang/test/Driver/cuda-option.f90 +++ b/flang/test/Driver/cuda-option.f90 @@ -1,6 +1,5 @@ ! Test -fcuda option ! RUN: %flang_fc1 -cpp -x cuda -fdebug-unparse %s -o - | FileCheck %s -! RUN: not %flang -cpp -x cuda %s -o - 2>&1 | FileCheck %s --check-prefix=MLIRERROR ! RUN: not %flang_fc1 -cpp %s -o - 2>&1 | FileCheck %s --check-prefix=ERROR program main #if _CUDA @@ -13,8 +12,4 @@ program main ! CHECK: INTEGER :: var = 1 ! CHECK: INTEGER, DEVICE :: dvar -! ERROR: cuda-option.f90:{{.*}}:{{.*}}: error: expected end of statement - -! The whole pipeline is not in place yet. It will currently fail at MLIR -! translation level. -! MLIRERROR: failed to legalize operation 'cuf.alloc' +! ERROR: cuda-option.f90:8:19: error: expected end of statement _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
