P4 to Git Change 1135916 by smekhano@stas-nova-hsa on 2015/03/30 18:31:55

ECR #333753 - TargetMachine is created not only for codegen, but for optimizer as well
	This is to provide target specific optimizations in the intermediate optimizer.
	LLVM 3.6 provides TargetTransformInfo for this purpose which requires TargetMachine.
	No correctness issues will occur if TargetInfo is not created, but optmizations will target generic machine.

	Testing: smoke, precheckin
	Reviewed by Evgeny Mankov

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/codegen.cpp#60 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/opt_level.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/opt_level.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/optimizer.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#16 edit

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

@@ -32,19 +32,6 @@
 using namespace amdcl;
 using namespace llvm;
 
-static std::string aclGetCodegenName(const aclTargetInfo &tgtInfo)
-{
-  assert(tgtInfo.arch_id <= aclLast && "Unknown device id!");
-  const FamilyMapping *family = familySet + tgtInfo.arch_id;
-  if (!family) return "";
-
-  assert((tgtInfo.chip_id) < family->children_size && "Unknown family id!");
-  const TargetMapping *target = &family->target[tgtInfo.chip_id];
-  return (target) ? target->codegen_name : "";
-}
-
-
-
 /*! Function that modifies the code gen level based on the
  * function size threshhold.
  */
@@ -229,13 +216,13 @@ llvmCodeGen(
 
     std::auto_ptr<TargetMachine>
         target(TheTarget->createTargetMachine(TheTriple.getTriple(),
-	       aclGetCodegenName(binary->target), FeatureStr, targetOptions,
+	       aclutGetCodegenName(binary->target), FeatureStr, targetOptions,
         WINDOWS_SWITCH(Reloc::DynamicNoPIC, Reloc::PIC_),
         CodeModel::Default, OLvl));
 #else
   std::auto_ptr<TargetMachine>
   target(TheTarget->createTargetMachine(TheTriple.getTriple(),
-        aclGetCodegenName(binary->target), FeatureStr,
+        aclutGetCodegenName(binary->target), FeatureStr,
         WINDOWS_SWITCH(Reloc::DynamicNoPIC, Reloc::PIC_),
         CodeModel::Default));
   assert(target.get() && "Could not allocate target machine!");
@@ -244,7 +231,7 @@ llvmCodeGen(
   // MCJIT(Jan)
   if(!isGPU && OptionsObj->oVariables->UseJIT) {
     TargetMachine* jittarget(TheTarget->createTargetMachine(TheTriple.getTriple(),
-	       aclGetCodegenName(binary->target), FeatureStr, targetOptions,
+	       aclutGetCodegenName(binary->target), FeatureStr, targetOptions,
         WINDOWS_SWITCH(Reloc::DynamicNoPIC, Reloc::PIC_),
         CodeModel::Default, OLvl));