diff --git a/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp b/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp --- a/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp +++ b/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp @@ -127,7 +127,6 @@ Type resultTy = op.getType(); Type i32Ty = matchContainerType(rewriter.getI32Type(), resultTy); - Type i64Ty = matchContainerType(rewriter.getI64Type(), resultTy); Value value = op.getValue(); if (getElementTypeOrSelf(value.getType()).getIntOrFloatBitWidth() > 32) { @@ -144,20 +143,13 @@ Value two32 = getConstantValue(loc, i32Ty, 2, rewriter); Value thirty32 = getConstantValue(loc, i32Ty, 30, rewriter); Value thirtyTwo32 = getConstantValue(loc, i32Ty, 32, rewriter); - Value thirtyTwo64 = getConstantValue(loc, i64Ty, 32, rewriter); // Compute the multiplication in 64-bits then select the high / low parts. - Value value64 = rewriter.create(loc, i64Ty, value32); - Value multiplier64 = - rewriter.create(loc, i64Ty, multiplier32); - Value multiply64 = - rewriter.create(loc, value64, multiplier64); - // Grab out the high/low of the computation - Value high64 = - rewriter.create(loc, multiply64, thirtyTwo64); - Value high32 = rewriter.create(loc, i32Ty, high64); - Value low32 = rewriter.create(loc, value32, multiplier32); + auto value64 = + rewriter.create(loc, value32, multiplier32); + Value low32 = value64.getLow(); + Value high32 = value64.getHigh(); // Determine the direction and amount to shift the high bits. Value shiftOver32 = rewriter.create( diff --git a/mlir/test/Conversion/TosaToArith/tosa-to-arith.mlir b/mlir/test/Conversion/TosaToArith/tosa-to-arith.mlir --- a/mlir/test/Conversion/TosaToArith/tosa-to-arith.mlir +++ b/mlir/test/Conversion/TosaToArith/tosa-to-arith.mlir @@ -21,15 +21,9 @@ // CHECK-DAG: %[[C2:.+]] = arith.constant 2 : i32 // CHECK-DAG: %[[C30:.+]] = arith.constant 30 : i32 // CHECK-DAG: %[[C32:.+]] = arith.constant 32 : i32 - // CHECK-DAG: %[[C32L:.+]] = arith.constant 32 : i64 // Compute the high-low values of the matmul in 64-bits. - // CHECK-DAG: %[[V64:.+]] = arith.extsi %arg0 : i32 to i64 - // CHECK-DAG: %[[M64:.+]] = arith.extsi %arg1 : i32 to i64 - // CHECK-DAG: %[[MUL64:.+]] = arith.muli %[[V64]], %[[M64]] - // CHECK-DAG: %[[HI64:.+]] = arith.shrui %[[MUL64]], %[[C32L]] - // CHECK-DAG: %[[HI:.+]] = arith.trunci %[[HI64]] : i64 to i32 - // CHECK-DAG: %[[LOW:.+]] = arith.muli %arg0, %arg1 + // CHECK-DAG: %[[LOW:.+]], %[[HI:.+]] = arith.mulsi_extended %arg0, %arg1 // Determine whether the high bits need to shift left or right and by how much. // CHECK-DAG: %[[OVER31:.+]] = arith.cmpi sge, %[[S32]], %[[C32]]