diff --git a/flang/lib/Lower/IntrinsicCall.cpp b/flang/lib/Lower/IntrinsicCall.cpp --- a/flang/lib/Lower/IntrinsicCall.cpp +++ b/flang/lib/Lower/IntrinsicCall.cpp @@ -515,6 +515,8 @@ mlir::Value genLeadz(mlir::Type, llvm::ArrayRef); fir::ExtendedValue genLen(mlir::Type, llvm::ArrayRef); fir::ExtendedValue genLenTrim(mlir::Type, llvm::ArrayRef); + template + mlir::Value genMask(mlir::Type, llvm::ArrayRef); fir::ExtendedValue genMatmul(mlir::Type, llvm::ArrayRef); fir::ExtendedValue genMaxloc(mlir::Type, llvm::ArrayRef); fir::ExtendedValue genMaxval(mlir::Type, llvm::ArrayRef); @@ -813,6 +815,8 @@ {"lgt", &I::genCharacterCompare}, {"lle", &I::genCharacterCompare}, {"llt", &I::genCharacterCompare}, + {"maskl", &I::genMask}, + {"maskr", &I::genMask}, {"matmul", &I::genMatmul, {{{"matrix_a", asAddr}, {"matrix_b", asAddr}}}, @@ -3314,6 +3318,27 @@ fir::getBase(args[1]), fir::getLen(args[1])); } +// MASKL, MASKR +template +mlir::Value IntrinsicLibrary::genMask(mlir::Type resultType, + llvm::ArrayRef args) { + assert(args.size() == 2); + + mlir::Value ones = builder.createIntegerConstant(loc, resultType, -1); + mlir::Value bitSize = builder.createIntegerConstant( + loc, resultType, resultType.getIntOrFloatBitWidth()); + mlir::Value bitsToSet = builder.createConvert(loc, resultType, args[0]); + + // The standard does not specify what to return if the number of bits to be + // set, I < 0 or I >= BIT_SIZE(KIND). The shift instruction used below will + // produce a poison value which may return a possibly platform-specific and/or + // non-deterministic result. Other compilers don't produce a consistent result + // in this case either, so we choose the most efficient implementation. + mlir::Value shift = + builder.create(loc, bitSize, bitsToSet); + return builder.create(loc, ones, shift); +} + // MATMUL fir::ExtendedValue IntrinsicLibrary::genMatmul(mlir::Type resultType, diff --git a/flang/test/Lower/Intrinsics/maskl.f90 b/flang/test/Lower/Intrinsics/maskl.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Lower/Intrinsics/maskl.f90 @@ -0,0 +1,86 @@ +! RUN: bbc -emit-fir %s -o - | FileCheck %s +! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s + +! CHECK-LABEL: maskl_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskl_test(a, b) + integer :: a + integer :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskl(a) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i32 + ! CHECK: %[[BITS:.*]] = arith.constant 32 : i32 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_VAL]] : i32 + ! CHECK: %[[SHIFT:.*]] = arith.shli %[[C__1]], %[[LEN]] : i32 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskl_test + +! CHECK-LABEL: maskl1_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskl1_test(a, b) + integer :: a + integer(kind=1) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskl(a, 1) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i8 + ! CHECK: %[[BITS:.*]] = arith.constant 8 : i8 + ! CHECK: %[[A_CONV:.*]] = fir.convert %[[A_VAL]] : (i32) -> i8 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_CONV]] : i8 + ! CHECK: %[[SHIFT:.*]] = arith.shli %[[C__1]], %[[LEN]] : i8 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskl1_test + +! CHECK-LABEL: maskl2_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskl2_test(a, b) + integer :: a + integer(kind=2) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskl(a, 2) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i16 + ! CHECK: %[[BITS:.*]] = arith.constant 16 : i16 + ! CHECK: %[[A_CONV:.*]] = fir.convert %[[A_VAL]] : (i32) -> i16 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_CONV]] : i16 + ! CHECK: %[[SHIFT:.*]] = arith.shli %[[C__1]], %[[LEN]] : i16 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskl2_test + +! CHECK-LABEL: maskl4_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskl4_test(a, b) + integer :: a + integer(kind=4) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskl(a, 4) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i32 + ! CHECK: %[[BITS:.*]] = arith.constant 32 : i32 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_VAL]] : i32 + ! CHECK: %[[SHIFT:.*]] = arith.shli %[[C__1]], %[[LEN]] : i32 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskl4_test + +! CHECK-LABEL: maskl8_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskl8_test(a, b) + integer :: a + integer(kind=8) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskl(a, 8) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i64 + ! CHECK: %[[BITS:.*]] = arith.constant 64 : i64 + ! CHECK: %[[A_CONV:.*]] = fir.convert %[[A_VAL]] : (i32) -> i64 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_CONV]] : i64 + ! CHECK: %[[SHIFT:.*]] = arith.shli %[[C__1]], %[[LEN]] : i64 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskl8_test + +! TODO: Code containing 128-bit integer literals current breaks. This is +! probably related to the issue linked below. When that is fixed, a test +! for kind=16 should be added here. +! +! https://github.com/llvm/llvm-project/issues/56446 diff --git a/flang/test/Lower/Intrinsics/maskr.f90 b/flang/test/Lower/Intrinsics/maskr.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Lower/Intrinsics/maskr.f90 @@ -0,0 +1,86 @@ +! RUN: bbc -emit-fir %s -o - | FileCheck %s +! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s + +! CHECK-LABEL: maskr_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskr_test(a, b) + integer :: a + integer :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskr(a) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i32 + ! CHECK: %[[BITS:.*]] = arith.constant 32 : i32 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_VAL]] : i32 + ! CHECK: %[[SHIFT:.*]] = arith.shrui %[[C__1]], %[[LEN]] : i32 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskr_test + +! CHECK-LABEL: maskr1_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskr1_test(a, b) + integer :: a + integer(kind=1) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskr(a, 1) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i8 + ! CHECK: %[[BITS:.*]] = arith.constant 8 : i8 + ! CHECK: %[[A_CONV:.*]] = fir.convert %[[A_VAL]] : (i32) -> i8 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_CONV]] : i8 + ! CHECK: %[[SHIFT:.*]] = arith.shrui %[[C__1]], %[[LEN]] : i8 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskr1_test + +! CHECK-LABEL: maskr2_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskr2_test(a, b) + integer :: a + integer(kind=2) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskr(a, 2) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i16 + ! CHECK: %[[BITS:.*]] = arith.constant 16 : i16 + ! CHECK: %[[A_CONV:.*]] = fir.convert %[[A_VAL]] : (i32) -> i16 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_CONV]] : i16 + ! CHECK: %[[SHIFT:.*]] = arith.shrui %[[C__1]], %[[LEN]] : i16 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskr2_test + +! CHECK-LABEL: maskr4_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskr4_test(a, b) + integer :: a + integer(kind=4) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskr(a, 4) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i32 + ! CHECK: %[[BITS:.*]] = arith.constant 32 : i32 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_VAL]] : i32 + ! CHECK: %[[SHIFT:.*]] = arith.shrui %[[C__1]], %[[LEN]] : i32 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskr4_test + +! CHECK-LABEL: maskr8_test +! CHECK-SAME: %[[A:.*]]: !fir.ref{{.*}}, %[[B:.*]]: !fir.ref{{.*}} +subroutine maskr8_test(a, b) + integer :: a + integer(kind=8) :: b + + ! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref + b = maskr(a, 8) + ! CHECK: %[[C__1:.*]] = arith.constant -1 : i64 + ! CHECK: %[[BITS:.*]] = arith.constant 64 : i64 + ! CHECK: %[[A_CONV:.*]] = fir.convert %[[A_VAL]] : (i32) -> i64 + ! CHECK: %[[LEN:.*]] = arith.subi %[[BITS]], %[[A_CONV]] : i64 + ! CHECK: %[[SHIFT:.*]] = arith.shrui %[[C__1]], %[[LEN]] : i64 + ! CHECK: fir.store %[[SHIFT]] to %[[B]] : !fir.ref +end subroutine maskr8_test + +! TODO: Code containing 128-bit integer literals current breaks. This is +! probably related to the issue linked below. When that is fixed, a test +! for kind=16 should be added here. +! +! https://github.com/llvm/llvm-project/issues/56446