[SYCL][Opaque pointer] Enable INTEL_SYCL_OPAQUEPOINTER_READY

clang/lib/Driver/ToolChains/Clang.cpp

@@ -7553,11 +7553,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                    false))
     CmdArgs.push_back("-fmodules-debuginfo");
 
+#ifndef INTEL_SYCL_OPAQUEPOINTER_READY
   if (!CLANG_ENABLE_OPAQUE_POINTERS_INTERNAL)
     CmdArgs.push_back("-no-opaque-pointers");
   else if ((Triple.isSPIRV() || Triple.isSPIR()) &&
            !SPIRV_ENABLE_OPAQUE_POINTERS)
     CmdArgs.push_back("-no-opaque-pointers");
+#endif
 
   ObjCRuntime Runtime = AddObjCRuntimeArgs(Args, Inputs, CmdArgs, rewriteKind);
   RenderObjCOptions(TC, D, RawTriple, Args, Runtime, rewriteKind != RK_None,

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -690,9 +690,10 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
     CmdArgs.push_back(
         Args.MakeArgString(Twine(PluginOptPrefix) + "jobs=" + Parallelism));
 
+#ifndef INTEL_SYCL_OPAQUEPOINTER_READY
   if (!CLANG_ENABLE_OPAQUE_POINTERS_INTERNAL)
     CmdArgs.push_back(Args.MakeArgString("-plugin-opt=no-opaque-pointers"));
-
+#endif
   // If an explicit debugger tuning argument appeared, pass it along.
   if (Arg *A =
           Args.getLastArg(options::OPT_gTune_Group, options::OPT_ggdbN_Group)) {

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -240,10 +240,12 @@ const char *SYCL::Linker::constructLLVMLinkCommand(
     // know it is an unbundled generated list.
     if (LinkSYCLDeviceLibs) {
       Opts.push_back("-only-needed");
+#ifndef INTEL_SYCL_OPAQUEPOINTER_READY
       // FIXME remove this when opaque pointers are supported for SPIR-V
       if (!this->getToolChain().getTriple().isSPIR()) {
         Opts.push_back("-opaque-pointers");
       }
+#endif
     }
     for (const auto &II : InputFiles) {
       std::string FileName = getToolChain().getInputFilename(II);

clang/test/CodeGenCXX/matrix-type-builtins.cpp

@@ -1,5 +1,3 @@
-
-// XFAIL:*
 // RUN: %clang_cc1 -fenable-matrix -triple x86_64-apple-darwin %s -emit-llvm -disable-llvm-passes -o - -std=c++17 | FileCheck %s
 
 // Tests for the matrix type builtins.

clang/test/Modules/merge-extension-ivars.m

@@ -2,19 +2,19 @@
 // RUN: rm -rf %t
 // RUN: split-file %s %t
 // RUN: %clang_cc1 -emit-llvm -o %t/test-compatible-extensions.ll -fobjc-runtime=macosx-10.9 -F%t/Frameworks %t/test-compatible-extensions.m \
-// RUN:            -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache -fmodule-name=InterfaceAndExtension -opaque-pointers
+// RUN:            -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache -fmodule-name=InterfaceAndExtension 
 // RUN: FileCheck --input-file=%t/test-compatible-extensions.ll %t/test-compatible-extensions.m
 
 // RUN: %clang_cc1 -emit-llvm -o %t/test-access-extension-ivar.ll -fobjc-runtime=macosx-10.9 -F%t/Frameworks %t/test-access-extension-ivar.m \
-// RUN:            -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache -opaque-pointers
+// RUN:            -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache 
 // RUN: FileCheck --input-file=%t/test-access-extension-ivar.ll %t/test-access-extension-ivar.m
 
 // RUN: %clang_cc1 -emit-llvm -o %t/test-synthesized-ivar.ll -fobjc-runtime=macosx-10.9 -F%t/Frameworks %t/test-synthesized-ivar.m \
-// RUN:            -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache -opaque-pointers
+// RUN:            -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache 
 // RUN: FileCheck --input-file=%t/test-synthesized-ivar.ll %t/test-synthesized-ivar.m
 // RUN: %clang_cc1 -emit-llvm -o %t/test-synthesized-ivar-extension.ll -fobjc-runtime=macosx-10.9 -F%t/Frameworks %t/test-synthesized-ivar.m \
 // RUN:            -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/modules.cache \
-// RUN:            -DIMPORT_EXTENSION=1 -opaque-pointers
+// RUN:            -DIMPORT_EXTENSION=1 
 // RUN: FileCheck --input-file=%t/test-synthesized-ivar-extension.ll %t/test-synthesized-ivar.m
 
 // Test various scenarios where we can end up with the same-name ivars coming from multiple modules.

llvm-spirv/test/DebugInfo/Generic/c-and-cpp-mixed.ll

@@ -1,11 +1,7 @@
 ;; This test checks that two DICompileUnits resulted in a link of C and C++
 ;; object files are being translated correctly
 
-; ifdef INTEL_SYCL_OPAQUEPOINTER_READY
-; COM: llvm-as < %s -o %t.bc
-; else
-; RUN: llvm-as -opaque-pointers < %s -o %t.bc
-; endif
+; RUN: llvm-as < %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -o %t.spv
 ; RUN: llvm-spirv --to-text %t.spv -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 ; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll

llvm-spirv/test/EnqueueEmptyKernel.ll

@@ -13,8 +13,8 @@
 ;;                  ^(){});
 ;; }
 ; RUN: llvm-as < %s > %t.bc
-; RUN: llvm-spirv -opaque-pointers=1 %t.bc -o - -spirv-text | FileCheck %s --check-prefix=CHECK-SPIRV
-; RUN: llvm-spirv -opaque-pointers=1 %t.bc -o %t.spv
+; RUN: llvm-spirv %t.bc -o - -spirv-text | FileCheck %s --check-prefix=CHECK-SPIRV
+; RUN: llvm-spirv %t.bc -o %t.spv
 ; RUN: spirv-val %t.spv
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"

llvm-spirv/test/extensions/INTEL/SPV_INTEL_fpga_memory_accesses/IntelFPGAMemoryAccesses.ll

@@ -41,7 +41,7 @@
 ;   return 0;
 ; }
 
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_accesses -o %t.spv
 ; RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 

llvm-spirv/test/extensions/INTEL/SPV_INTEL_fpga_memory_accesses/intel_fpga_lsu_optimized.ll

@@ -49,7 +49,7 @@
 ; }
 
 ; Check that translation of optimized IR doesn't crash:
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_accesses -o %t.spv
 
 ; Check that reverse translation restore ptr.annotations correctly:

llvm-spirv/test/extensions/INTEL/SPV_INTEL_fpga_memory_attributes/IntelFPGAMemoryAttributes.ll

@@ -205,7 +205,7 @@
 ; LLVM IR compilation command:
 ; clang -cc1 -triple spir -disable-llvm-passes -fsycl-is-device -emit-llvm intel-fpga-local-var.cpp
 
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_attributes -o %t.spv
 ; RUN: llvm-spirv %t.spv --spirv-ext=+SPV_INTEL_fpga_memory_attributes -to-text -o %t.spt
 ; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

llvm-spirv/test/extensions/INTEL/SPV_INTEL_fpga_memory_attributes/IntelFPGAMemoryAttributesForStruct.ll

@@ -181,7 +181,7 @@
 ; LLVM IR compilation command:
 ; clang -cc1 -triple spir -disable-llvm-passes -fsycl-is-device -emit-llvm intel-fpga-local-var.cpp
 
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_attributes -o %t.spv
 ; RUN: llvm-spirv %t.spv --spirv-ext=+SPV_INTEL_fpga_memory_attributes -to-text -o %t.spt
 ; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

llvm-spirv/test/extensions/INTEL/SPV_INTEL_fpga_reg/IntelFPGAReg.ll

@@ -54,7 +54,7 @@
 ;   A ca(213);
 ;   A cb = __builtin_intel_fpga_reg(ca);
 
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; FIXME: add more negative test cases
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_reg -o %t.spv
 ; RUN: llvm-spirv %t.spv -to-text -o %t.spt

llvm-spirv/test/extensions/INTEL/SPV_INTEL_function_pointers/alias.ll

@@ -1,6 +1,6 @@
 ; XFAIL: *
 
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv -spirv-ext=+SPV_INTEL_function_pointers -spirv-text %t.bc -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 ; RUN: llvm-spirv -spirv-ext=+SPV_INTEL_function_pointers %t.bc -o %t.spv
 ; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o - | FileCheck %s --check-prefix=CHECK-LLVM

llvm-spirv/test/extensions/INTEL/SPV_INTEL_function_pointers/global-function-pointer.ll

@@ -1,6 +1,6 @@
-; RUN: llvm-as -opaque-pointers=1 < %s | llvm-spirv -spirv-ext=+SPV_INTEL_function_pointers -o %t.spv
+; RUN: llvm-as < %s | llvm-spirv -spirv-ext=+SPV_INTEL_function_pointers -o %t.spv
 ; RUN: llvm-spirv %t.spv -spirv-ext=+SPV_INTEL_function_pointers -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
-; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -opaque-pointers=1 | FileCheck %s --check-prefix=CHECK-LLVM
+; RUN: llvm-spirv -r %t.spv -o - | llvm-dis | FileCheck %s --check-prefix=CHECK-LLVM
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
 target triple = "spir64"

llvm-spirv/test/extensions/INTEL/SPV_INTEL_io_pipes/PipeStorageIOINTEL.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_io_pipes -o %t.spv
 ; RUN: llvm-spirv %t.spv -to-text -o %t.spt
 ; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

llvm-spirv/test/image.ll

@@ -1,6 +1,6 @@
 ; XFAIL: *
 
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 ; RUN: llvm-spirv %t.bc -o %t.spv
 ; RUN: llvm-spirv -r %t.spv -o %t.rev.bc

llvm-spirv/test/layout.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -spirv-text -o %t
 ; RUN: FileCheck < %t %s
 ; RUN: llvm-spirv %t.bc -o %t.spv

llvm-spirv/test/llvm-intrinsics/memmove.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -spirv-text -o %t.txt
 ; RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV
 ; RUN: llvm-spirv %t.bc -o %t.spv

llvm-spirv/test/transcoding/PipeStorage.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -spirv-text -o %t.txt
 ; RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV
 ; RUN: llvm-spirv %t.bc -o %t.spv

llvm-spirv/test/transcoding/annotate_attribute.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1  %s -o %t.bc
+; RUN: llvm-as  %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 
 ; RUN: llvm-spirv %t.bc -o %t.spv
@@ -7,7 +7,7 @@
 
 ; Check that even when FPGA memory extensions are enabled - yet we have
 ; UserSemantic decoration be generated
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_accesses,+SPV_INTEL_fpga_memory_attributes -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 
 ; Check SPIR-V versions in a format magic number + version

llvm-spirv/test/transcoding/annotation_generic_decoration.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_attributes -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_attributes -o %t.spv
 ; RUN: llvm-spirv -r %t.spv -o %t.rev.bc

llvm-spirv/test/transcoding/multiple_user_semantic_nonopaque.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 
 ; RUN: llvm-spirv %t.bc -o %t.spv
@@ -7,7 +7,7 @@
 
 ; Check that even when FPGA memory extensions are enabled - yet we have
 ; UserSemantic decoration be generated
-; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_fpga_memory_accesses,+SPV_INTEL_fpga_memory_attributes -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 
 ; CHECK-SPIRV: Name [[#ClassMember:]] "class.Sample"

llvm-spirv/test/transcoding/spirv-private-array-initialization.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers=1 <%s -o %t.bc
+; RUN: llvm-as <%s -o %t.bc
 ; RUN: llvm-spirv %t.bc -o %t.spv
 ; RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 ; RUN: llvm-spirv -r %t.spv -o %t_4mspirv.bc

llvm/CMakeLists.txt

@@ -909,6 +909,7 @@ set(DPCPP_ENABLE_OPAQUE_POINTERS TRUE CACHE BOOL
    "Enable opaque pointers by default.")
 if (DPCPP_ENABLE_OPAQUE_POINTERS)
   add_definitions("-DENABLE_OPAQUE_POINTERS=1")
+  add_definitions("-DINTEL_SYCL_OPAQUEPOINTER_READY=1")
 endif(DPCPP_ENABLE_OPAQUE_POINTERS)
 set(SPIRV_ENABLE_OPAQUE_POINTERS TRUE CACHE BOOL
     "Enable opaque pointers for SPIR-V offload by default.")

llvm/cmake/modules/TableGen.cmake

@@ -4,6 +4,8 @@
 # Adds the name of the generated file to TABLEGEN_OUTPUT.
 include(LLVMDistributionSupport)
 
+list(APPEND LLVM_TABLEGEN_FLAGS "-DINTEL_SYCL_OPAQUEPOINTER_READY")
+
 function(tablegen project ofn)
   cmake_parse_arguments(ARG "" "" "DEPENDS;EXTRA_INCLUDES" ${ARGN})
 

llvm/lib/SYCLLowerIR/CMakeLists.txt

@@ -13,10 +13,10 @@ endif()
 if (NOT TARGET LLVMGenXIntrinsics)
   if (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
     set(LLVMGenXIntrinsics_GIT_REPO https://github.com/intel/vc-intrinsics.git)
-    # Author: Gorban, Igor <igor.gorban@intel.com>
-    # Date:   Tue Jun 6 23:56:43 2023 +0000
-    # Mark llvm15 tests failures
-    set(LLVMGenXIntrinsics_GIT_TAG 910db4801d4a029834606e3e42a8d60358e74fdf)
+    # Author: Jinsong Ji <jinsong.ji@intel.com>
+    # Date:   Thu Aug 10 14:41:52 2023 +0000
+    #    Guard removed typed pointer enum within version macro
+    set(LLVMGenXIntrinsics_GIT_TAG 17a53f4304463b8e7e639d57ef17479040a8a2ad)
 
     message(STATUS "vc-intrinsics repo is missing. Will try to download it from ${LLVMGenXIntrinsics_GIT_REPO}")
     include(FetchContent)

llvm/test/Analysis/LoopCacheAnalysis/compute-cost.ll

@@ -1,5 +1,5 @@
-; RUN: opt < %s  -opaque-pointers -cache-line-size=32 -passes='print<loop-cache-cost>' -disable-output 2>&1 | FileCheck -check-prefix=SMALLER-CACHELINE %s
-; RUN: opt < %s  -opaque-pointers -cache-line-size=256 -passes='print<loop-cache-cost>' -disable-output 2>&1 | FileCheck -check-prefix=LARGER-CACHELINE %s
+; RUN: opt < %s  -cache-line-size=32 -passes='print<loop-cache-cost>' -disable-output 2>&1 | FileCheck -check-prefix=SMALLER-CACHELINE %s
+; RUN: opt < %s  -cache-line-size=256 -passes='print<loop-cache-cost>' -disable-output 2>&1 | FileCheck -check-prefix=LARGER-CACHELINE %s
 
 ;; This test is similar to test/Analysis/LoopCacheAnalysis/PowerPC/compute-cost.ll,
 ;; with differences that it tests the scenarios where an option for cache line size is

llvm/test/Analysis/MemorySSA/pr43641.ll

@@ -1,4 +1,4 @@
-; RUN: opt -opaque-pointers -passes=simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s
+; RUN: opt -passes=simple-loop-unswitch -enable-nontrivial-unswitch -verify-memoryssa -S < %s | FileCheck %s
 ; REQUIRES: asserts
 
 ; CHECK-LABEL: @c

llvm/test/Analysis/UniformityAnalysis/AMDGPU/MIR/loads-gmir.mir

@@ -1,4 +1,4 @@
-# RUN: llc --opaque-pointers -mtriple=amdgcn-- -run-pass=print-machine-uniformity -o - %s 2>&1 | FileCheck %s
+# RUN: llc -mtriple=amdgcn-- -run-pass=print-machine-uniformity -o - %s 2>&1 | FileCheck %s
 
 ---
 name:            loads

llvm/test/Assembler/autoupgrade-invalid-name-mangling.ll

@@ -1,4 +1,4 @@
-; RUN: not llvm-as -opaque-pointers < %s 2>&1 | FileCheck %s
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
 ; CHECK: Intrinsic called with incompatible signature
 ; CHECK-NEXT: %reg = call i32 @llvm.read_register.i64(

llvm/test/Assembler/comment.ll

@@ -1,5 +1,5 @@
-; RUN: llvm-as -opaque-pointers < %s | llvm-dis -show-annotations | FileCheck -check-prefix=ANNOT %s
-; RUN: llvm-as -opaque-pointers < %s | llvm-dis | FileCheck -check-prefix=BARE %s
+; RUN: llvm-as < %s | llvm-dis -show-annotations | FileCheck -check-prefix=ANNOT %s
+; RUN: llvm-as < %s | llvm-dis | FileCheck -check-prefix=BARE %s
 ; RUN: verify-uselistorder %s
 
 ; The bare version of this file should not have any #uses lines.

llvm/test/Assembler/invalid-vecreduce.ll

@@ -1,4 +1,4 @@
-; RUN: not opt -opaque-pointers -S < %s 2>&1 | FileCheck %s
+; RUN: not opt -S < %s 2>&1 | FileCheck %s
 
 ; CHECK: Intrinsic has incorrect return type!
 ; CHECK-NEXT: ptr @llvm.vector.reduce.fadd.f32.f64.v2f64

llvm/test/Assembler/scalable-vector-struct.ll

@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
 ; ifndef INTEL_SYCL_OPAQUEPOINTER_READY
-; RUN: opt -opaque-pointers -passes=verify -S < %s 2>&1 | FileCheck %s
+; RUN: opt -passes=verify -S < %s 2>&1 | FileCheck %s
 ; endif
 
 %struct.test = type { <vscale x 1 x i32>, <vscale x 1 x i32> }

llvm/test/Bindings/llvm-c/globals.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as -opaque-pointers < %s | llvm-c-test --module-list-globals | FileCheck %s
+; RUN: llvm-as < %s | llvm-c-test --module-list-globals | FileCheck %s
 
 @foo = constant [7 x i8] c"foobar\00", align 1
 ;CHECK: GlobalDefinition: foo ptr

llvm/test/Bitcode/alloca-addrspace.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis -opaque-pointers | FileCheck %s
+; RUN: llvm-as < %s | llvm-dis | FileCheck %s
 
 target datalayout = "A2"
 

llvm/test/Bitcode/arm-intrinsics.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-dis -opaque-pointers < %S/arm-intrinsics.bc | FileCheck %s
+; RUN: llvm-dis < %S/arm-intrinsics.bc | FileCheck %s
 
 define void @f(i32* %p) {
 ; CHECK: call i32 @llvm.arm.ldrex.p0(ptr elementtype(i32)

llvm/test/Bitcode/atomic-no-syncscope.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-dis -opaque-pointers -o - %s.bc | FileCheck %s
+; RUN: llvm-dis -o - %s.bc | FileCheck %s
 
 ; Backwards compatibility test: make sure we can process bitcode without
 ; synchronization scope names encoded in it.

llvm/test/Bitcode/atomic.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | llvm-dis -opaque-pointers | FileCheck %s
+; RUN: llvm-as %s -o - | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder < %s
 
 define void @test_cmpxchg(i32* %addr, i32 %desired, i32 %new) {

llvm/test/Bitcode/atomicrmw-upgrade.ll

@@ -1,4 +1,4 @@
-; RUN: llvm-dis -opaque-pointers < %s.bc | FileCheck %s
+; RUN: llvm-dis < %s.bc | FileCheck %s
 ; RUN: verify-uselistorder < %s.bc
 
 ; atomicrmw-upgrade.ll.bc was produced by running a version of llvm-as from just

llvm/test/Bitcode/attributes-3.3.ll

@@ -1,4 +1,4 @@
-; RUN:  llvm-dis -opaque-pointers < %s.bc| FileCheck %s
+; RUN:  llvm-dis < %s.bc| FileCheck %s
 ; RUN:  verify-uselistorder < %s.bc
 
 ; attributes-3.3.ll.bc was generated by passing this file to llvm-as-3.3.