Skip to content

[mlir][tosa] Reorder Tosa_ExtensionAttrs to match with definition order #134319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2025

Conversation

Jerry-Ge
Copy link
Member

@Jerry-Ge Jerry-Ge commented Apr 3, 2025

Simple refactor change.

Signed-off-by: Jerry Ge <[email protected]>
Change-Id: I0497e4466a3efacd8970ff88390f2f6557c4933e
@llvmbot
Copy link
Member

llvmbot commented Apr 3, 2025

@llvm/pr-subscribers-mlir

@llvm/pr-subscribers-mlir-tosa

Author: Jerry-Ge (Jerry-Ge)

Changes

Simple refactor change.


Full diff: https://github.com/llvm/llvm-project/pull/134319.diff

1 Files Affected:

  • (modified) mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td (+4-3)
diff --git a/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td b/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td
index 4cb2e8006ca57..3a6d3d178ff37 100644
--- a/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td
+++ b/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td
@@ -250,9 +250,10 @@ def Tosa_EXT_DYNAMIC      : I32EnumAttrCase<"dynamic", 11>;
 
 def Tosa_ExtensionAttr
     : Tosa_I32EnumAttr<"Extension", "supported TOSA extensions", "ext", [
-      Tosa_EXT_INT16, Tosa_EXT_INT4, Tosa_EXT_BF16, Tosa_EXT_FP8E4M3,
-      Tosa_EXT_FP8E5M2, Tosa_EXT_FFT, Tosa_EXT_VARIABLE, Tosa_EXT_CONTROLFLOW,
-      Tosa_EXT_DOUBLEROUND, Tosa_EXT_INEXACTROUND, Tosa_EXT_DYNAMIC, Tosa_EXT_NONE
+      Tosa_EXT_NONE, Tosa_EXT_INT16, Tosa_EXT_INT4, Tosa_EXT_BF16, 
+      Tosa_EXT_FP8E4M3, Tosa_EXT_FP8E5M2, Tosa_EXT_FFT, Tosa_EXT_VARIABLE, 
+      Tosa_EXT_CONTROLFLOW, Tosa_EXT_DOUBLEROUND, Tosa_EXT_INEXACTROUND, 
+      Tosa_EXT_DYNAMIC
     ]>;
 
 def Tosa_ExtensionArrayAttr

@Jerry-Ge Jerry-Ge requested a review from GeorgeARM April 3, 2025 23:28
@lhutton1 lhutton1 merged commit d6c076e into llvm:main Apr 4, 2025
14 checks passed
@llvm-ci
Copy link
Collaborator

llvm-ci commented Apr 4, 2025

LLVM Buildbot has detected a new failure on builder flang-aarch64-out-of-tree running on linaro-flang-aarch64-out-of-tree while building mlir at step 9 "test-build-flang-unified-tree-check-flang".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/53/builds/14840

Here is the relevant piece of the build log for the reference
Step 9 (test-build-flang-unified-tree-check-flang) failure: test (failure)
******************** TEST 'Flang :: Transforms/DoConcurrent/loop_nest_test.f90' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
module attributes {dlti.dl_spec = #dlti.dl_spec<!llvm.ptr<271> = dense<32> : vector<4xi64>, !llvm.ptr<272> = dense<64> : vector<4xi64>, f128 = dense<128> : vector<2xi64>, !llvm.ptr<270> = dense<32> : vector<4xi64>, f64 = dense<64> : vector<2xi64>, i64 = dense<64> : vector<2xi64>, i8 = dense<[8, 32]> : vector<2xi64>, i16 = dense<[16, 32]> : vector<2xi64>, i128 = dense<128> : vector<2xi64>, i32 = dense<32> : vector<2xi64>, f16 = dense<16> : vector<2xi64>, !llvm.ptr = dense<64> : vector<4xi64>, i1 = dense<8> : vector<2xi64>, "dlti.stack_alignment" = 128 : i64, "dlti.endianness" = "little", "dlti.mangling_mode" = "e">, fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = "", llvm.data_layout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32", llvm.ident = "flang version 21.0.0 (https://github.com/llvm/llvm-project.git d6c076eeaa9d57363c6b64989d17fd094363bf9e)", llvm.target_triple = "aarch64-unknown-linux-gnu", omp.is_gpu = false, omp.is_target_device = false, omp.target_triples = [], omp.version = #omp.version<version = 31>} {
  func.func @_QQmain() attributes {fir.bindc_name = "main"} {
    return
  }
  func.func private @_QFPfoo(%arg0: !fir.ref<i32> {fir.bindc_name = "n"}) attributes {fir.host_symbol = @_QQmain, llvm.linkage = #llvm.linkage<internal>} {
    %0 = fir.alloca i32 {bindc_name = "k"}
    %1:2 = hlfir.declare %0 {uniq_name = "_QFFfooEk"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %2 = fir.alloca i32 {bindc_name = "j"}
    %3:2 = hlfir.declare %2 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %4 = fir.alloca i32 {bindc_name = "i"}
    %5:2 = hlfir.declare %4 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %6 = fir.alloca i32 {bindc_name = "j"}
    %7:2 = hlfir.declare %6 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %8 = fir.alloca i32 {bindc_name = "i"}
    %9:2 = hlfir.declare %8 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %10 = fir.alloca i32 {bindc_name = "j"}
    %11:2 = hlfir.declare %10 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %12 = fir.alloca i32 {bindc_name = "i"}
    %13:2 = hlfir.declare %12 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %14 = fir.alloca i32 {bindc_name = "j"}
    %15:2 = hlfir.declare %14 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %16 = fir.alloca i32 {bindc_name = "i"}
    %17:2 = hlfir.declare %16 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %18 = fir.alloca i32 {bindc_name = "j"}
    %19:2 = hlfir.declare %18 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %20 = fir.alloca i32 {bindc_name = "i"}
    %21:2 = hlfir.declare %20 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %22 = fir.alloca i32 {bindc_name = "j"}
    %23:2 = hlfir.declare %22 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %24 = fir.alloca i32 {bindc_name = "i"}
    %25:2 = hlfir.declare %24 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %26 = fir.alloca i32 {bindc_name = "j"}
    %27:2 = hlfir.declare %26 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %28 = fir.alloca i32 {bindc_name = "i"}
    %29:2 = hlfir.declare %28 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %30 = fir.dummy_scope : !fir.dscope
    %31:2 = hlfir.declare %arg0 dummy_scope %30 {uniq_name = "_QFFfooEn"} : (!fir.ref<i32>, !fir.dscope) -> (!fir.ref<i32>, !fir.ref<i32>)
    %32 = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFFfooEi"}
    %33:2 = hlfir.declare %32 {uniq_name = "_QFFfooEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %34 = fir.alloca i32 {bindc_name = "j", uniq_name = "_QFFfooEj"}
    %35:2 = hlfir.declare %34 {uniq_name = "_QFFfooEj"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %36 = fir.alloca i32 {bindc_name = "k", uniq_name = "_QFFfooEk"}
    %37:2 = hlfir.declare %36 {uniq_name = "_QFFfooEk"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
    %38 = fir.alloca i32 {bindc_name = "m", uniq_name = "_QFFfooEm"}
    %39:2 = hlfir.declare %38 {uniq_name = "_QFFfooEm"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants