P4 to Git Change 1259658 by bsumner@bsumner-lin-opencl on 2016/04/19 13:49:51

SWDEV-92314 - add means for library to query for GFX8+ chip

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/compiler_stage.hpp#13 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#141 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/linker/include/AMDResolveLinker.h#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/linker/lib/AMDResolveLinker.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/linker/tools/opencl-link/opencl-link.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDLLVMContextHook.h#30 edit

rocclr/compiler/lib/backends/common/compiler_stage.hpp

@@ -97,6 +97,7 @@ namespace amdcl
       void setDenormsAreZero(bool Val) { hookup_.amdoptions.DenormsAreZero = Val; }
       void setUniformWorkGroupSize(bool Val) { hookup_.amdoptions.UniformWorkGroupSize = Val; }
       void setHaveFastFMA32(bool Val) { hookup_.amdoptions.HaveFastFMA32 = Val; }
+      void setISAVersion(int Val) { hookup_.amdoptions.ISAVersion = Val; }
 
       /*! Returns the llvm binary */
       llvm::Module* LLVMBinary() const { return llvmbinary_; }

rocclr/compiler/lib/backends/common/linker.cpp

@@ -750,6 +750,12 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &libs)
                 || chip == "Hawaii"
                 || chip == "Carrizo"
                 || chip == "");
+  setISAVersion((chip == "Hawaii") ? 701 :
+               ((chip == "Iceland" || chip == "Tonga") ? 800 :
+               ((chip == "Carrizo") ? 801 :
+               ((chip == "Fiji" || chip == "Baffin" || chip == "Ellesmere") ? 804 :
+               ((chip == "Stoney")  ? 810 :
+               ((chip == "") ? 900 : 700))))));
   LLVMBinary()->getContext().setAMDLLVMContextHook(&hookup_);
 
   std::string clp_errmsg;