From e9f89c0eb4b8e20c323b27385ad54e1179d40c6c Mon Sep 17 00:00:00 2001 From: hanhanW Date: Fri, 7 Feb 2025 01:22:38 +0800 Subject: [PATCH 1/3] Integrate llvm to llvm/llvm-project@e470dcae8d2c41 Signed-off-by: hanhanW --- third_party/llvm-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/llvm-project b/third_party/llvm-project index 51a24f5c6c69..e470dcae8d2c 160000 --- a/third_party/llvm-project +++ b/third_party/llvm-project @@ -1 +1 @@ -Subproject commit 51a24f5c6c69599db23a7504505182e813839270 +Subproject commit e470dcae8d2c4138a89974ceeb413b1568d3a112 From d196e3d723b36cd4deec1a221e3e5e581efcbf5d Mon Sep 17 00:00:00 2001 From: hanhanW Date: Fri, 7 Feb 2025 01:23:33 +0800 Subject: [PATCH 2/3] Revert https://github.com/llvm/llvm-project/commit/8c1dbac304d2f3d9e9685c1f4fd8b3e133360893 Signed-off-by: hanhanW --- third_party/llvm-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/llvm-project b/third_party/llvm-project index e470dcae8d2c..8c7674b8b3d7 160000 --- a/third_party/llvm-project +++ b/third_party/llvm-project @@ -1 +1 @@ -Subproject commit e470dcae8d2c4138a89974ceeb413b1568d3a112 +Subproject commit 8c7674b8b3d79d5989a8a73bb42e721cd69fb4e8 From 0a4e6be5ac8532c75df8f15a79415e69b1f30ac7 Mon Sep 17 00:00:00 2001 From: hanhanW Date: Fri, 7 Feb 2025 11:03:35 +0800 Subject: [PATCH 3/3] fixes for https://github.com/iree-org/llvm-project/commit/f0b8ff12519270adcfef93410abff76ab073476a Signed-off-by: hanhanW --- .../dynamic_tosa_quantized_fully_connected_issue_10859.mlir | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/regression/dynamic_tosa_quantized_fully_connected_issue_10859.mlir b/tests/e2e/regression/dynamic_tosa_quantized_fully_connected_issue_10859.mlir index 460991a9be87..7ee0bf8d5c26 100644 --- a/tests/e2e/regression/dynamic_tosa_quantized_fully_connected_issue_10859.mlir +++ b/tests/e2e/regression/dynamic_tosa_quantized_fully_connected_issue_10859.mlir @@ -1,13 +1,13 @@ // Regression testcase from https://github.com/iree-org/iree/issues/10859 func.func @main(%arg0: tensor<256xi8>, %arg1: tensor<2xi32>, %arg2: tensor<2x32xi8>, %arg3: tensor<32xi32>, %arg4: tensor<32x32xi8>, %arg5: tensor<32xi32>, %arg6: tensor<32x3360xi8>, %arg7: tensor) -> (tensor) { - %0 = tosa.fully_connected %arg7, %arg6, %arg5 {quantization_info = #tosa.conv_quant} : (tensor, tensor<32x3360xi8>, tensor<32xi32>) -> tensor + %0 = tosa.fully_connected %arg7, %arg6, %arg5 {input_zp = -128 : i32, weight_zp = 0 : i32} : (tensor, tensor<32x3360xi8>, tensor<32xi32>) -> tensor %1 = tosa.rescale %0 {double_round = true, input_zp = 0 : i32, multiplier = array, output_zp = -128 : i32, per_channel = false, scale32 = true, shift = array} : (tensor) -> tensor %2 = tosa.clamp %1 {max_fp = 0.000000e+00 : f32, max_int = 127 : i64, min_fp = 0.000000e+00 : f32, min_int = -128 : i64} : (tensor) -> tensor - %3 = tosa.fully_connected %2, %arg4, %arg3 {quantization_info = #tosa.conv_quant} : (tensor, tensor<32x32xi8>, tensor<32xi32>) -> tensor + %3 = tosa.fully_connected %2, %arg4, %arg3 {input_zp = -128 : i32, weight_zp = 0 : i32} : (tensor, tensor<32x32xi8>, tensor<32xi32>) -> tensor %4 = tosa.rescale %3 {double_round = true, input_zp = 0 : i32, multiplier = array, output_zp = -128 : i32, per_channel = false, scale32 = true, shift = array} : (tensor) -> tensor %5 = tosa.clamp %4 {max_fp = 0.000000e+00 : f32, max_int = 127 : i64, min_fp = 0.000000e+00 : f32, min_int = -128 : i64} : (tensor) -> tensor - %6 = tosa.fully_connected %5, %arg2, %arg1 {quantization_info = #tosa.conv_quant} : (tensor, tensor<2x32xi8>, tensor<2xi32>) -> tensor + %6 = tosa.fully_connected %5, %arg2, %arg1 {input_zp = -128 : i32, weight_zp = 0 : i32} : (tensor, tensor<2x32xi8>, tensor<2xi32>) -> tensor %7 = tosa.rescale %6 {double_round = true, input_zp = 0 : i32, multiplier = array, output_zp = 44 : i32, per_channel = false, scale32 = true, shift = array} : (tensor) -> tensor %8 = tosa.table %7, %arg0 : (tensor, tensor<256xi8>) -> tensor return %8 : tensor