[AIE] Add libc/libc++ standard header include paths

Xilinx · Aug 26, 2024 · 9554b49 · 9554b49
1 parent 93271b2
commit 9554b49
Show file tree

Hide file tree

Showing 56 changed files with 120 additions and 54 deletions.
diff --git a/clang/lib/Driver/ToolChains/AIE.cpp b/clang/lib/Driver/ToolChains/AIE.cpp
@@ -80,6 +80,50 @@ void AIEToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
   // Don't pull in system headers from /usr/include or /usr/local/include.
   // All of the basic headers that we need come from the compiler.
   CC1Args.push_back("-nostdsysteminc");
+
+  if (DriverArgs.hasArg(options::OPT_nostdlibinc))
+    return;
+
+  const Driver &D = getDriver();
+  std::string Target = getTripleString();
+  SmallString<128> Path(D.Dir);
+  llvm::sys::path::append(Path, "..", "include", Target);
+  if (getVFS().exists(Path))
+    addExternCSystemInclude(DriverArgs, CC1Args, Path.str());
+}
+
+void AIEToolChain::addLibCxxIncludePaths(
+    const llvm::opt::ArgList &DriverArgs,
+    llvm::opt::ArgStringList &CC1Args) const {
+
+  if (DriverArgs.hasArg(options::OPT_nostdinc, options::OPT_nostdlibinc,
+                        options::OPT_nostdincxx))
+    return;
+
+  // We don't ship libc/libcxx for AIE1
+  if (getTriple().isAIE1())
+    return;
+
+  const Driver &D = getDriver();
+  std::string Target = getTripleString();
+
+  SmallString<128> Path(D.Dir);
+  llvm::sys::path::append(Path, "..", "include");
+
+  std::string Version = detectLibcxxVersion(Path);
+  if (Version.empty())
+    return;
+
+  // First add the per-target include path.
+  SmallString<128> TargetDir(Path);
+  llvm::sys::path::append(TargetDir, Target, "c++", Version);
+  if (getVFS().exists(TargetDir))
+    addSystemInclude(DriverArgs, CC1Args, TargetDir);
+
+  // Second add the generic one.
+  SmallString<128> Dir(Path);
+  llvm::sys::path::append(Dir, "c++", Version);
+  addSystemInclude(DriverArgs, CC1Args, Dir);
 }
 
 void AIEToolChain::addClangTargetOptions(

diff --git a/clang/lib/Driver/ToolChains/AIE.h b/clang/lib/Driver/ToolChains/AIE.h
@@ -42,10 +42,12 @@ class LLVM_LIBRARY_VISIBILITY AIEToolChain : public Generic_ELF {
   AIEToolChain(const Driver &D, const llvm::Triple &Triple,
                const llvm::opt::ArgList &Args);
 
-  // No support for finding a C++ standard library yet.
-  void addLibCxxIncludePaths(
-      const llvm::opt::ArgList &DriverArgs,
-      llvm::opt::ArgStringList &CC1Args) const override {}
+  CXXStdlibType GetDefaultCXXStdlibType() const override {
+    return ToolChain::CST_Libcxx;
+  }
+
+  void addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
+                             llvm::opt::ArgStringList &CC1Args) const override;
   void addLibStdCxxIncludePaths(
       const llvm::opt::ArgList &DriverArgs,
       llvm::opt::ArgStringList &CC1Args) const override {}

diff --git a/clang/test/CodeGen/aie/aie2/acc32.cpp b/clang/test/CodeGen/aie/aie2/acc32.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 // CHECK-LABEL: @_Z3foou7__acc32(
 // CHECK-NEXT:  entry:
 // CHECK-NEXT:    [[ARG_ADDR:%.*]] = alloca i32, align 4

diff --git a/clang/test/CodeGen/aie/aie2/accfloat.cpp b/clang/test/CodeGen/aie/aie2/accfloat.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 // CHECK-LABEL: @_Z3foou10__accfloat(
 // CHECK-NEXT:  entry:
 // CHECK-NEXT:    [[ARG_ADDR:%.*]] = alloca i32, align 4

diff --git a/clang/test/CodeGen/aie/aie2/aie2-TargetAS-to-DefaultAS-assignment.cpp b/clang/test/CodeGen/aie/aie2/aie2-TargetAS-to-DefaultAS-assignment.cpp
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 // Test expression where pointer with AS is assigned to pointer with Default AS.
-// RUN: %clang -O1 --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang -O1 --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 // CHECK-LABEL: define dso_local noundef i32 @_Z29check_assignment_toDefault_ASPU3AS6iPi(
 // CHECK-SAME: ptr addrspace(6) nocapture readonly [[NUM:%.*]], ptr nocapture writeonly [[MEM:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-accumulator-float.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-accumulator-float.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 #include <stdint.h>
 

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-accumulator.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-accumulator.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 #include <stdint.h>
 

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-bfloat.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-bfloat.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2  -D_LIBCPP_HAS_THREAD_API_PTHREAD -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc  -D_LIBCPP_HAS_THREAD_API_PTHREAD -S -emit-llvm %s -o - | FileCheck %s
 
 #include <stdint.h>
 

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-compressed.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-compressed.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 #include <stdint.h>
 

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-sparse-compress.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-sparse-compress.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 #include <stdint.h>
 

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-sparse.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-sparse.cpp
@@ -6,7 +6,7 @@
 //
 // (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
 
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 #include <stdint.h>
 

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-vector-alignment.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-vector-alignment.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -target aie2  -fsyntax-only %s -o -
+// RUN: %clang -target aie2 -nostdlibinc -fsyntax-only %s -o -
 
 #define VECTOR_ALIGN_16 16
 #define VECTOR_ALIGN_32 32

diff --git a/clang/test/CodeGen/aie/aie2/aie2-abi-vector.cpp b/clang/test/CodeGen/aie/aie2/aie2-abi-vector.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 #include <stdint.h>
 

diff --git a/clang/test/CodeGen/aie/aie2/aie2-accfloat-intrisics.cpp b/clang/test/CodeGen/aie/aie2/aie2-accfloat-intrisics.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z13test_add_confDv16_u10__accfloatS_iii(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-addlog.cpp b/clang/test/CodeGen/aie/aie2/aie2-addlog.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang -O2 --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 //
 // CHECK-LABEL: @_Z11test_selectbcc(

diff --git a/clang/test/CodeGen/aie/aie2/aie2-addr-intrinsic.cpp b/clang/test/CodeGen/aie/aie2/aie2-addr-intrinsic.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 
 // CHECK-LABEL: @_Z14test_byte_incrPDv32_si(

diff --git a/clang/test/CodeGen/aie/aie2/aie2-bank-annotation.cpp b/clang/test/CodeGen/aie/aie2/aie2-bank-annotation.cpp
@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 // Test to check the bank annotation for AIE2, specifically the translation of __aie_dm_resource_* to the correct address space.
-// RUN: %clang -O1 --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang -O1 --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 // CHECK-LABEL: define dso_local noundef i32 @_Z6squarePU3AS5iS0_(
 // CHECK-SAME: ptr addrspace(5) nocapture readonly [[NUM:%.*]], ptr addrspace(5) nocapture writeonly [[MEM:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {

diff --git a/clang/test/CodeGen/aie/aie2/aie2-bf16-intrinsics.cpp b/clang/test/CodeGen/aie/aie2/aie2-bf16-intrinsics.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z12band_v32bf16Dv32_u6__bf16S_(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-divs.cpp b/clang/test/CodeGen/aie/aie2/aie2-divs.cpp
@@ -6,7 +6,7 @@
 //
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 // CHECK-LABEL: @_Z3divii(
 // CHECK-NEXT:  entry:
 // CHECK-NEXT:    [[TMP0:%.*]] = tail call { i32, i32 } @llvm.aie2.divs(i32 [[A:%.*]], i32 0, i32 [[B:%.*]])

diff --git a/clang/test/CodeGen/aie/aie2/aie2-intrinsics.cpp b/clang/test/CodeGen/aie/aie2/aie2-intrinsics.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O0 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O0 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z21test_mac_4x2_2x4_confiiiiii(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-ldst.cpp b/clang/test/CodeGen/aie/aie2/aie2-ldst.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z9test_packDv32_si(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-locks.cpp b/clang/test/CodeGen/aie/aie2/aie2-locks.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang -O2 --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 
 //
 // CHECK-LABEL: @_Z18test_acquire_equaljj(

diff --git a/clang/test/CodeGen/aie/aie2/aie2-lut-intrinsic.cpp b/clang/test/CodeGen/aie/aie2/aie2-lut-intrinsic.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z19test_load_lut_int32PKvS0_Dv16_i(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-operator-minus-accumulators.cpp b/clang/test/CodeGen/aie/aie2/aie2-operator-minus-accumulators.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O1 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O1 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z25test_operator_minus_acc32Dv32_u7__acc32S_(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-operator-plus-accumulators.cpp b/clang/test/CodeGen/aie/aie2/aie2-operator-plus-accumulators.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O1 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O1 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z24test_operator_plus_acc32Dv32_u7__acc32S_(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-pckt_header.cpp b/clang/test/CodeGen/aie/aie2/aie2-pckt_header.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z25test_put_ms_packet_headerijj(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-scalar.cpp b/clang/test/CodeGen/aie/aie2/aie2-scalar.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z15test_get_coreidv(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-sched_barrier.cpp b/clang/test/CodeGen/aie/aie2/aie2-sched_barrier.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z23test_scheduling_barrierv(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-scl2vec-intrinsic-bounds.cpp b/clang/test/CodeGen/aie/aie2/aie2-scl2vec-intrinsic-bounds.cpp
@@ -4,7 +4,7 @@
 //
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 
-// RUN: not %clang -O2 %s --target=aie2 -S -emit-llvm -o - |& FileCheck %s
+// RUN: not %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - |& FileCheck %s
 
 // CHECK: error: index out of range [0,63]
 char test_ext_elem_bounds(v64int8 v, int idx, int sign) {

diff --git a/clang/test/CodeGen/aie/aie2/aie2-scl2vec-intrinsic.cpp b/clang/test/CodeGen/aie/aie2/aie2-scl2vec-intrinsic.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 
 // CHECK-LABEL: @_Z11test_shiftxDv16_iS_ii(

diff --git a/clang/test/CodeGen/aie/aie2/aie2-set-mode.cpp b/clang/test/CodeGen/aie/aie2/aie2-set-mode.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z16test_set_satmodej(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-sparse-intrinsics.cpp b/clang/test/CodeGen/aie/aie2/aie2-sparse-intrinsics.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z18test_mul_4x32_32x8Dv128_h16v256uint4_sparse(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-store-load-TM.cpp b/clang/test/CodeGen/aie/aie2/aie2-store-load-TM.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z12test_read_tmj(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-stream-intrinsics.cpp b/clang/test/CodeGen/aie/aie2/aie2-stream-intrinsics.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z21test_get_scd_v16acc32i(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-typecast.cpp b/clang/test/CodeGen/aie/aie2/aie2-typecast.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang --target=aie2 -S -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang --target=aie2 -nostdlibinc -S -emit-llvm %s -o - | FileCheck %s
 enum class AccumClass { Int };
 
 template <AccumClass Class, unsigned Bits, unsigned Elems>

diff --git a/clang/test/CodeGen/aie/aie2/aie2-undef-vectors.cpp b/clang/test/CodeGen/aie/aie2/aie2-undef-vectors.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clang -O2 %s --target=aie2 -S -emit-llvm -o - | FileCheck %s
+// RUN: %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - | FileCheck %s
 
 // CHECK-LABEL: @_Z18test_undef_v32int4v(
 // CHECK-NEXT:  entry:

diff --git a/clang/test/CodeGen/aie/aie2/aie2-unsupported-operator-accumulators.cpp b/clang/test/CodeGen/aie/aie2/aie2-unsupported-operator-accumulators.cpp
@@ -8,7 +8,7 @@
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
-// RUN: not %clang -O1 %s --target=aie2 -ferror-limit=100 -S -emit-llvm -o - 2>&1 | FileCheck %s
+// RUN: not %clang -O1 %s --target=aie2 -nostdlibinc -ferror-limit=100 -S -emit-llvm -o - 2>&1 | FileCheck %s
 
 // CHECK: error: cannot compile this operator for accumulator type yet
 v8accfloat test_operator_plus_accfloat(v8accfloat a, v8accfloat b) {

diff --git a/clang/test/CodeGen/aie/aie2/aie2-upd-ext-intrinsic-bounds.cpp b/clang/test/CodeGen/aie/aie2/aie2-upd-ext-intrinsic-bounds.cpp
@@ -4,7 +4,7 @@
 //
 // (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates
 
-// RUN: not %clang -O2 %s --target=aie2 -S -emit-llvm -o - |& FileCheck %s
+// RUN: not %clang -O2 %s --target=aie2 -nostdlibinc -S -emit-llvm -o - |& FileCheck %s
 
 // CHECK: error: index out of range [0,3]
 v32uint4 test_extract_v32uint4(v128uint4 a, int idx) {