Enable mem2reg if -cl-opt-disable was not specified

common_clang.cpp

@@ -325,7 +325,12 @@ Compile(const char *pszProgramSource, const char **pInputHeaders,
  SmallVectorBuffer StreamBuf(pResult->getIRBufferRef());
  std::ostream OS(&StreamBuf);
  std::string Err;
- success = llvm::writeSpirv(M.get(), OS, Err);
+ SPIRV::TranslatorOpts SPIRVOpts;
+ SPIRVOpts.enableAllExtensions();
+ if (!optionsParser.hasOptDisable()) {
+ SPIRVOpts.setMemToRegEnabled(true);
+ }
+ success = llvm::writeSpirv(M.get(), SPIRVOpts, OS, Err);
  err_ostream << Err.c_str();
  err_ostream.flush();
  }

options.h

@@ -143,7 +143,7 @@ class EffectiveOptionsFilter {
 class CompileOptionsParser {
 public:
  CompileOptionsParser(const char *pszOpenCLVersion)
- : m_commonFilter(pszOpenCLVersion), m_emitSPIRV(false) {}
+ : m_commonFilter(pszOpenCLVersion), m_emitSPIRV(false), m_optDisable(false) {}
 
  //
  // Validates and prepares the effective options to pass to clang upon
@@ -175,6 +175,7 @@ class CompileOptionsParser {
  std::string getEffectiveOptionsAsString() const;
 
  bool hasEmitSPIRV() const { return m_emitSPIRV; }
+ bool hasOptDisable() const { return m_optDisable; }
 
 private:
  OpenCLCompileOptTable m_optTbl;
@@ -183,6 +184,7 @@ class CompileOptionsParser {
  llvm::SmallVector<const char *, 16> m_effectiveArgsRaw;
  std::string m_sourceName;
  bool m_emitSPIRV;
+ bool m_optDisable;
 };
 
 // Tokenize a string into tokens separated by any char in 'delims'.

options_compile.cpp

@@ -242,7 +242,10 @@ void CompileOptionsParser::processOptions(const char *pszOptions,
  for (ArgsVector::iterator it = m_effectiveArgs.begin(),
  end = m_effectiveArgs.end();
  it != end; ++it) {
- if (it->compare("-emit-spirv") == 0) {
+ if (it->compare("-cl-opt-disable") == 0) {
+ m_optDisable = true;
+ }
+ else if (it->compare("-emit-spirv") == 0) {
  m_effectiveArgsRaw.push_back("-emit-llvm-bc");
  m_emitSPIRV = true;
  continue;