Merge branch 'main' of https://github.com/intel/intel-xpu-backend-for-triton into amyachev/issue2945

Author: anmyachev

.github/workflows/auto-update-translator-cid.yml

@@ -66,7 +66,7 @@ jobs:
 
       - name: Get commit ID from Triton's spirv-llvm-translator.conf
         if: ${{ env.TARGET_PRID == null }}
-        run: echo "CID_CURRENT=$(cat ./lib/Target/SPIRV/spirv-llvm-translator.conf)" >> $GITHUB_ENV
+        run: echo "CID_CURRENT=$(<third_party/intel/lib/Target/SPIRV/spirv-llvm-translator.conf)" >> $GITHUB_ENV
 
       - name: Checkout SPIRV-LLVM-Translator
         if: ${{ env.TARGET_PRID == null }}
@@ -82,12 +82,12 @@ jobs:
         run: |
           echo "CID_LATEST=$(git -C external/SPIRV-LLVM-Translator rev-parse HEAD)" >> $GITHUB_ENV
 
-      # the latest valid cid has been weitten to spirv-llvm-translator.conf
+      # the latest valid cid has been written to spirv-llvm-translator.conf
       - name: Search the latest valid Translator cid
         if: ${{ env.TARGET_PRID == null }}
         run: |
           ./scripts/check-update-translator-cid.sh $CID_LATEST $CID_CURRENT
-          if git status --porcelain ./lib/Target/SPIRV/spirv-llvm-translator.conf | grep '^ M'; then
+          if git status --porcelain third_party/intel/lib/Target/SPIRV/spirv-llvm-translator.conf | grep '^ M'; then
             echo "MODIFIED=true" >> $GITHUB_ENV
             echo "spirv-llvm-translator.conf has been modified"
           fi
@@ -112,7 +112,7 @@ jobs:
           git checkout -b ${PR_BRANCH}
           git branch --show-current # bot/update_translator_cid
           git status
-          git add ./lib/Target/SPIRV/spirv-llvm-translator.conf
+          git add third_party/intel/lib/Target/SPIRV/spirv-llvm-translator.conf
           git commit -m "Update spirv-llvm-translator.conf"
           git push origin ${PR_BRANCH}
-          pr_url=$(gh pr create --title "[github-bot] Update spirv-llvm-translator.conf" --body "Automated PR to update translator commit id." --reviewer whitneywhtsang --head ${PR_BRANCH} --base main)
+          gh pr create --title "[github-bot] Update spirv-llvm-translator.conf" --body "Automated PR to update translator commit id." --reviewer whitneywhtsang --head ${PR_BRANCH} --base main

python/src/ir.cc

@@ -1680,11 +1680,11 @@ void init_triton_ir(py::module &&m) {
              if (haveDiagnostics) {
                context->printOpOnDiagnostic(true);
                context->printStackTraceOnDiagnostic(true);
+               context->getDiagEngine().registerHandler([](Diagnostic &diag) {
+                 llvm::outs() << diag << "\n";
+                 return success();
+               });
              }
-             context->getDiagEngine().registerHandler([](Diagnostic &diag) {
-               llvm::outs() << diag << "\n";
-               return success();
-             });
              if (haveDump) {
                auto printingFlags = OpPrintingFlags();
                printingFlags.elideLargeElementsAttrs(16);

scripts/check-update-translator-cid.sh

@@ -25,7 +25,7 @@ COMMIT_IDS=$(git -C $TRITON_PROJ/external/SPIRV-LLVM-Translator log --format="%H
 cd $TRITON_PROJ
 FOUND=false
 for cid in $COMMIT_IDS; do
-    echo "$cid" > ./lib/Target/SPIRV/spirv-llvm-translator.conf
+    echo "$cid" > third_party/intel/lib/Target/SPIRV/spirv-llvm-translator.conf
 
     BUILD_STATUS=PASS
     echo "::group::Building Triton for $cid"
@@ -52,5 +52,5 @@ for cid in $COMMIT_IDS; do
 done
 
 if [ "$FOUND" = false ]; then
-    git restore ./lib/Target/SPIRV/spirv-llvm-translator.conf
+    git restore third_party/intel/lib/Target/SPIRV/spirv-llvm-translator.conf
 fi

third_party/intel/lib/Target/SPIRV/spirv-llvm-translator.conf

@@ -1 +1 @@
-c1828a93d050afe8a44cc239a2908270c578c345
+50af2c70832745be1c0ce1562c4038162c319e5c