Merge remote-tracking branch 'origin' into tiling-bf16-support

libxsmm · Feb 17, 2025 · 59d847a · 59d847a
2 parents 974c3eb + bac688f
commit 59d847a
Show file tree

Hide file tree

Showing 41 changed files with 277 additions and 269 deletions.
diff --git a/.github/workflows/tpp-benchmark.yml b/.github/workflows/tpp-benchmark.yml
@@ -5,18 +5,20 @@ on:
     inputs:
       RUN_EMR_BENCH:
         description: "Run on Emerald Rapids"
-        default: "1"
+        type: boolean
+        default: true
       RUN_ZEN_BENCH:
         description: "Run on Zen5"
-        default: "0"
+        type: boolean
+        default: true
       RUN_CLX_BENCH:
         description: "Run on CLX"
-        default: "0"
+        type: boolean
+        default: true
   push:
     branches:
       - 'main'
   pull_request:
-    types: [ labeled ]
 
 env:
   NPROCS_LIMIT_LINK: 8
@@ -25,18 +27,20 @@ env:
 
 jobs:
   Check_LLVM:
-    if: ${{ github.event_name }} == "push" || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark' }}) || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }})
+    if: |
+      (github.event_name == 'push') || (github.event_name == 'workflow_dispatch') ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark')) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full'))
     uses: ./.github/workflows/tpp-llvm.yml
     secrets: inherit
 
   TPP-MLIR-EMR-BASE:
     runs-on: pcl-tiergarten
-    if: ${{ github.event_name }} == "push" || \
-        ${{ inputs.RUN_EMR_BENCH }} == 1 || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark' }}) || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }})
+    if: |
+      (github.event_name == 'push') || 
+      (github.event_name == 'workflow_dispatch' && inputs.RUN_EMR_BENCH) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark')) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full'))
     needs: Check_LLVM
     steps:
       - uses: actions/checkout@v4
@@ -48,10 +52,11 @@ jobs:
 
   TPP-MLIR-EMR-OMP:
     runs-on: pcl-tiergarten
-    if: ${{ github.event_name }} == "push" || \
-        ${{ inputs.RUN_EMR_BENCH }} == 1 || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark' }}) || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }})
+    if: |
+      (github.event_name == 'push') || 
+      (github.event_name == 'workflow_dispatch' && inputs.RUN_EMR_BENCH) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark')) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full'))
     needs: Check_LLVM
     steps:
       - uses: actions/checkout@v4
@@ -63,9 +68,10 @@ jobs:
 
   TPP-MLIR-ZEN-BASE:
     runs-on: pcl-tiergarten
-    if: ${{ github.event_name }} == "push" || \
-        ${{ inputs.RUN_ZEN_BENCH }} == 1 || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }})
+    if: |
+      (github.event_name == 'push') || 
+      (github.event_name == 'workflow_dispatch' && inputs.RUN_ZEN_BENCH) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full'))
     needs: Check_LLVM
     steps:
       - uses: actions/checkout@v4
@@ -77,9 +83,10 @@ jobs:
 
   TPP-MLIR-ZEN-OMP:
     runs-on: pcl-tiergarten
-    if: ${{ github.event_name }} == "push" || \
-        ${{ inputs.RUN_ZEN_BENCH }} == 1 || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }})
+    if: |
+      (github.event_name == 'push') || 
+      (github.event_name == 'workflow_dispatch' && inputs.RUN_ZEN_BENCH) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full'))
     needs: Check_LLVM
     steps:
       - uses: actions/checkout@v4
@@ -91,9 +98,10 @@ jobs:
 
   TPP-MLIR-CLX-BASE:
     runs-on: pcl-tiergarten
-    if: ${{ github.event_name }} == "push" || \
-        ${{ inputs.RUN_CLX_BENCH }} == 1 || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }})
+    if: |
+      (github.event_name == 'push') || 
+      (github.event_name == 'workflow_dispatch' && inputs.RUN_CLX_BENCH) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full'))
     needs: Check_LLVM
     steps:
       - uses: actions/checkout@v4
@@ -105,9 +113,10 @@ jobs:
 
   TPP-MLIR-CLX-OMP:
     runs-on: pcl-tiergarten
-    if: ${{ github.event_name }} == "push" || \
-        ${{ inputs.RUN_CLX_BENCH }} == 1 || \
-        (${{ github.event_name }} == "pull_request" && ${{ github.event.label.name == 'benchmark-all' }})
+    if: |
+      (github.event_name == 'push') || 
+      (github.event_name == 'workflow_dispatch' && inputs.RUN_CLX_BENCH) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark-full'))
     needs: Check_LLVM
     steps:
       - uses: actions/checkout@v4
@@ -116,4 +125,3 @@ jobs:
           CMD="KIND=Release COMPILER=clang LINKER=lld BENCHMARK_NUM_ITER=${{ env.NUM_ITER }} \
                 ${{ github.workspace }}/scripts/github/benchmark.sh -o"
           ${{ env.SRUN }} --partition=clxap --time=0:30:00 -- $CMD
-        
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ If you don't want to build with OneDNN, disable with the CMake flag `-DUSE_OneDN
 
 ```sh
 # Clone
-git clone https://github.com/plaidml/tpp-mlir.git
+git clone https://github.com/libxsmm/tpp-mlir.git
 mkdir tpp-mlir/build
 pushd tpp-mlir/build
 

diff --git a/benchmarks/config/base/base.json b/benchmarks/config/base/base.json
@@ -5,28 +5,28 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": {},
-      "flags": [ "100", "256", "0", "F", "32", "32", "32", "0", "0", "1024", "1024", "1024", "1024" ],
+      "flags": [ "100", "256", "0", "F", "32", "32", "32", "0", "1", "1024", "1024", "1024", "1024" ],
       "extensions": []
     },
     "gemm_bf16_dnn_target": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": {},
-      "flags": [ "100", "256", "0", "F", "32", "32", "32", "1", "1", "1024", "1024", "1024", "1024" ],
+      "flags": [ "100", "256", "0", "F", "32", "32", "32", "1", "2", "1024", "1024", "1024", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "mlp_fp32_dnn_target": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": {},
-      "flags": [ "100", "256", "5", "F", "32", "32", "32", "0", "0", "1024", "1024", "1024", "1024" ],
+      "flags": [ "100", "256", "5", "F", "32", "32", "32", "0", "1", "1024", "1024", "1024", "1024" ],
       "extensions": []
     },
     "mlp_bf16_dnn_target": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": {},
-      "flags": [ "100", "256", "5", "F", "32", "32", "32", "1", "1", "1024", "1024", "1024", "1024" ],
+      "flags": [ "100", "256", "5", "F", "32", "32", "32", "1", "2", "1024", "1024", "1024", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "gemm_fp32_mlir": {

diff --git a/benchmarks/config/fc/1024x1024x512.json b/benchmarks/config/fc/1024x1024x512.json
@@ -5,14 +5,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "0", "512", "1024" ],
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "1", "512", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_fp32_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "0", "512", "1024" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "1", "512", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},
@@ -22,14 +22,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "1", "512", "1024" ],
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "2", "512", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_bf16_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "1", "512", "1024" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "2", "512", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},

diff --git a/benchmarks/config/fc/1024x2560x1024.json b/benchmarks/config/fc/1024x2560x1024.json
@@ -5,14 +5,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "0", "1024", "2560" ],
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "1", "1024", "2560" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_fp32_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "0", "1024", "2560" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "1", "1024", "2560" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},
@@ -22,14 +22,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "1", "1024", "2560" ],
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "2", "1024", "2560" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_bf16_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "1", "1024", "2560" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "2", "1024", "2560" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},

diff --git a/benchmarks/config/fc/1024x352x512.json b/benchmarks/config/fc/1024x352x512.json
@@ -5,14 +5,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "0", "0", "512", "352" ],
+      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "0", "1", "512", "352" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_fp32_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "0", "0", "512", "352" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "0", "1", "512", "352" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},
@@ -22,14 +22,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "1", "1", "512", "352" ],
+      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "1", "2", "512", "352" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_bf16_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "1", "1", "512", "352" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "32", "32", "32", "1", "2", "512", "352" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},

diff --git a/benchmarks/config/fc/1024x512x256.json b/benchmarks/config/fc/1024x512x256.json
@@ -5,14 +5,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "0", "256", "512" ],
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "1", "256", "512" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_fp32_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "0", "256", "512" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "0", "1", "256", "512" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},
@@ -22,14 +22,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "1", "256", "512" ],
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "2", "256", "512" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_bf16_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "1", "256", "512" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "1024", "3", "F", "64", "64", "64", "1", "2", "256", "512" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},

diff --git a/benchmarks/config/fc/128x1024x1024.json b/benchmarks/config/fc/128x1024x1024.json
@@ -5,14 +5,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "0", "1024", "1024" ],
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "1", "1024", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_fp32_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "0", "1024", "1024" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "1", "1024", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},
@@ -22,14 +22,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "1", "1024", "1024" ],
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "2", "1024", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_bf16_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "1", "1024", "1024" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "2", "1024", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},

diff --git a/benchmarks/config/fc/128x1024x4096.json b/benchmarks/config/fc/128x1024x4096.json
@@ -5,14 +5,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "0", "4096", "1024" ],
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "1", "4096", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_fp32_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "0", "4096", "1024" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "0", "1", "4096", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},
@@ -22,14 +22,14 @@
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
       "environment": { "OMP_NUM_THREADS": "1" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "1", "4096", "1024" ],
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "2", "4096", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     },
     "fc_bf16_omp_16_dnn": {
       "type": "XSMM-DNN",
       "benchmark": "xsmm_dnn_mlp",
-      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0" },
-      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "1", "4096", "1024" ],
+      "environment": { "OMP_NUM_THREADS": "16", "KMP_AFFINITY": "granularity=fine,verbose,compact,1,0", "LIBXSMM_DNN_DISABLE_SFC": "1" },
+      "flags": [ "100", "128", "3", "F", "64", "64", "64", "1", "2", "4096", "1024" ],
       "extensions": [ "(avx2|asimd)" ]
     }
   }},