Address more code review feedback.

Author: maarquitos14

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -144,8 +144,8 @@ void SPIRVModuleAnalysis::setBaseInfo(const Module &M) {
         static_cast<SPIRV::MemoryModel::MemoryModel>(getMetadataUInt(MemMD, 1));
   } else {
     // TODO: Add support for VulkanMemoryModel.
-    MAI.Mem = !ST->isShaderEnv() ? SPIRV::MemoryModel::OpenCL
-                                 : SPIRV::MemoryModel::GLSL450;
+    MAI.Mem = ST->isShaderEnv() ? SPIRV::MemoryModel::GLSL450
+                                : SPIRV::MemoryModel::OpenCL;
     if (MAI.Mem == SPIRV::MemoryModel::OpenCL) {
       unsigned PtrSize = ST->getPointerSize();
       MAI.Addr = PtrSize == 32   ? SPIRV::AddressingModel::Physical32

llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp

@@ -119,10 +119,10 @@ bool SPIRVSubtarget::canUseExtInstSet(
 
 SPIRV::InstructionSet::InstructionSet
 SPIRVSubtarget::getPreferredInstructionSet() const {
-  if (!isShaderEnv())
-    return SPIRV::InstructionSet::OpenCL_std;
-  else
+  if (isShaderEnv())
     return SPIRV::InstructionSet::GLSL_std_450;
+  else
+    return SPIRV::InstructionSet::OpenCL_std;
 }
 
 bool SPIRVSubtarget::isAtLeastSPIRVVer(VersionTuple VerToCompareTo) const {