Fixes for Intel SDE and PIN tools

Author: amd-arsuresh

script/get-intel-pin-tool/customize.py

@@ -22,7 +22,7 @@ def preprocess(i):
     if 'MLC_INTEL_PINTOOL_BIN_WITH_PATH' not in env:
         if env.get('MLC_INTEL_PINTOOL_DIR_PATH', '') != '':
             pintool_path = env['MLC_INTEL_PINTOOL_DIR_PATH']
-            if os.path.exists(os.path.join(pintool_path, 'pin')):
+            if os.path.exists(os.path.join(pintool_path, exe)):
                 env['MLC_TMP_PATH'] = pintool_path
 
         r = i['automation'].find_artifact({'file_name': exe,
@@ -45,6 +45,7 @@ def detect_version(i):
                                        'env_key': 'MLC_INTEL_PINTOOL_VERSION',
                                        'which_env': i['env']})
     if r['return'] > 0:
+        print(r)
         return r
     version = r['version']
 

script/get-intel-pin-tool/meta.yaml

@@ -34,6 +34,7 @@ tags:
 - intel
 - pintool
 - pin
+- tool
 tests:
   run_inputs:
   - {}

script/get-intel-pin-tool/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-pintool_bin=${MLC_INTEL_PINTOOL_BIN_WITH_PATH}
+pintool_bin=${MLC_INTEL_PINTOOL_BIN_WITH_PATH:-${MLC_INTEL_PINTOOL_DIR_PATH}/pin}
 echo "${pintool_bin} -version"
 
 ${pintool_bin} -version > tmp-ver.out

script/get-intel-sde-tool/customize.py

@@ -22,7 +22,7 @@ def preprocess(i):
     if 'MLC_INTEL_SDE_BIN_WITH_PATH' not in env:
         if env.get('MLC_INTEL_SDE_DIR_PATH', '') != '':
             sde_path = env['MLC_INTEL_SDE_DIR_PATH']
-            if os.path.exists(os.path.join(sde_path, 'sde')):
+            if os.path.exists(os.path.join(sde_path, exe)):
                 env['MLC_TMP_PATH'] = sde_path
 
         r = i['automation'].find_artifact({'file_name': exe,