Revert "[CI] Drop DPCPP_ENABLE_OPAQUE_POINTERS cmake flag (#8286)"

This reverts commit 130466e.

Author: whitneywhtsang

.github/workflows/sycl_nightly.yml

@@ -47,7 +47,7 @@ jobs:
       build_cache_root: "/__w/"
       build_cache_suffix: opaque_pointers
       build_artifact_suffix: opaque_pointers
-      build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
+      build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
 
   ubuntu2204_opaque_pointers_build_test:
     if: github.repository == 'intel/llvm'
@@ -58,7 +58,7 @@ jobs:
       build_cache_root: "/__w/"
       build_cache_suffix: opaque_pointers
       build_artifact_suffix: opaque_pointers
-      build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
+      build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
       build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
 
   windows_default:

libclc/CMakeLists.txt

@@ -381,12 +381,6 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
                 # have to be explicity declared in the soruce.
                 list( APPEND flags -Xclang -fdeclare-spirv-builtins)
 
-                if(NOT SPIRV_ENABLE_OPAQUE_POINTERS)
-                  list(APPEND flags "-UENABLE_OPAQUE_POINTERS")
-                  list(APPEND flags "SHELL:-Xclang -no-opaque-pointers")
-                  list(APPEND opt_flags "-opaque-pointers=0")
-                endif()
-
                 # OpenCL 3.0 extensions
                 list( APPEND flags -cl-std=CL3.0 "SHELL:-Xclang" )
                 string(CONCAT CL_3_0_EXTENSIONS

libclc/utils/libclc-remangler/LibclcRemangler.cpp

@@ -779,11 +779,6 @@ class LibCLCRemangler : public ASTConsumer {
   void Initialize(ASTContext &C) override {
     ASTCtx = &C;
     SMDiagnostic Err;
-#if SPIRV_ENABLE_OPAQUE_POINTERS
-    LLVMCtx.setOpaquePointers(true);
-#else
-    LLVMCtx.setOpaquePointers(false);
-#endif
     std::unique_ptr<MemoryBuffer> const Buff = ExitOnErr(
         errorOrToExpected(MemoryBuffer::getFileOrSTDIN(InputIRFilename)));
     std::unique_ptr<llvm::Module> const M =

llvm-spirv/tools/llvm-spirv/llvm-spirv.cpp

@@ -154,7 +154,7 @@ static cl::opt<bool>
     SPIRVToolsDis("spirv-tools-dis", cl::init(false),
                   cl::desc("Emit textual assembly using SPIRV-Tools"));
 
-#if SPIRV_ENABLE_OPAQUE_POINTERS
+#if ENABLE_OPAQUE_POINTERS
 constexpr static bool SPIRVOpaquePointersDefault = true;
 #else
 constexpr static bool SPIRVOpaquePointersDefault = false;

llvm/CMakeLists.txt

@@ -890,7 +890,7 @@ if(NOT LLVM_ENABLE_NEW_PASS_MANAGER)
                       " no longer supported.")
 endif()
 
-set(DPCPP_ENABLE_OPAQUE_POINTERS TRUE CACHE BOOL
+set(DPCPP_ENABLE_OPAQUE_POINTERS FALSE CACHE BOOL
    "Enable opaque pointers by default.")
 if (DPCPP_ENABLE_OPAQUE_POINTERS)
   add_definitions("-DENABLE_OPAQUE_POINTERS=1")

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

@@ -2355,8 +2355,6 @@ Error BitcodeReader::parseTypeTableBody() {
                                     //          [pointee type, address space]
       if (Record.empty())
         return error("Invalid pointer record");
-      if (LLVM_UNLIKELY(!Context.hasSetOpaquePointersValue()))
-        Context.setOpaquePointers(false);
       unsigned AddressSpace = 0;
       if (Record.size() == 2)
         AddressSpace = Record[1];