commit 2ceb6591f0c20df1c2533b3f4e67146ffbe26a20
author alan-baker <alanbaker@google.com> Tue Jun 07 09:41:35 2022 -0400
committer GitHub <noreply@github.com> Tue Jun 07 09:41:35 2022 -0400
tree d3c63b6928c80edc9612e1c50d70fc4bfd01abbe
parent 93d1f9f0bc3579b5ea8960b53a0fe2f4f4607954

Handle opaque pointers in image specialization (#863)

Contributes to #816

* Image specialization now handles both transparent and opaque pointers
  * Much of the code can be removed after moving fully to opaque
    pointers
  * Doesn't use InferTypes because the pass's traversal is necessary and would
    simply be repeated
  * Specialized builtin functions are now remangled from an updated type instead of having a
    suffix tacked on
* Fixed some image query functions to support mangled struct names
* Fixed some builtin demangling
* Changed how opaque pointers is disabled
  * added a new command line option to control it
  * sets the code gen option
  * remove the command line parsing

lib/Compiler.cpp

diff --git a/lib/Compiler.cpp b/lib/Compiler.cpp
index ff81dd8..6229e9f 100644
--- a/lib/Compiler.cpp
+++ b/lib/Compiler.cpp
@@ -157,6 +157,10 @@
         "Emit LLVM IR to the given file after parsing and stop compilation."),
     llvm::cl::value_desc("filename"));
 
+static llvm::cl::opt<bool> OpaquePointers("enable-opaque-pointers",
+                                          llvm::cl::desc("Use opaque pointers"),
+                                          llvm::cl::init(false));
+
 namespace {
 struct OpenCLBuiltinMemoryBuffer final : public llvm::MemoryBuffer {
   OpenCLBuiltinMemoryBuffer(const void *data, uint64_t data_length) {
@@ -465,6 +469,7 @@
   instance.getCodeGenOpts().SimplifyLibCalls = false;
   instance.getCodeGenOpts().EmitOpenCLArgMetadata = false;
   instance.getCodeGenOpts().DisableO0ImplyOptNone = true;
+  instance.getCodeGenOpts().OpaquePointers = OpaquePointers;
   instance.getDiagnosticOpts().IgnoreWarnings = IgnoreWarnings;
 
   instance.getLangOpts().SinglePrecisionConstants =
@@ -834,21 +839,16 @@
   // ParseCommandLineOptions with the specific options.
   bool has_pre = false;
   bool has_load_pre = false;
-  bool has_opaque_pointers = false;
   const std::string pre = "-enable-pre";
   const std::string load_pre = "-enable-load-pre";
-  const std::string opaque = "-opaque-pointers";
   for (int i = 1; i < argc; ++i) {
     std::string option(argv[i]);
     auto pre_pos = option.find(pre);
     auto load_pos = option.find(load_pre);
-    auto opaque_pos = option.find(opaque);
     if (pre_pos == 0 || (pre_pos == 1 && option[0] == '-')) {
       has_pre = true;
     } else if (load_pos == 0 || (load_pos == 1 && option[0] == '-')) {
       has_load_pre = true;
-    } else if (opaque_pos == 0 || (opaque_pos == 1 && option[0] == '-')) {
-      has_opaque_pointers = true;
     }
   }
 
@@ -864,10 +864,6 @@
   if (!has_load_pre) {
     llvmArgv[llvmArgc++] = "-enable-load-pre=0";
   }
-  // TODO(#816): remove this after final transition.
-  if (!has_opaque_pointers) {
-    llvmArgv[llvmArgc++] = "-opaque-pointers=0";
-  }
 
   llvm::cl::ResetAllOptionOccurrences();
   llvm::cl::ParseCommandLineOptions(llvmArgc, llvmArgv);