Skip to content

[flang] Use hlfir.cmpchar for SELECT CASE of charsSelect case hlfir cmpchar #168476

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.

Sign up for GitHub

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 10 commits into from
Nov 21, 2025
Merged

[flang] Use hlfir.cmpchar for SELECT CASE of charsSelect case hlfir cmpchar #168476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64ea014
[flang] Use hlfir.cmpchar for SELECT CASE of chars
eugeneepshteyn Nov 18, 2025
a6a457c
clang-format
eugeneepshteyn Nov 18, 2025
aa2b047
lib/Lower/Bridge.cpp: Temporarily returned fir::runtime::genCharCompa…
eugeneepshteyn Nov 18, 2025
0a741a6
Merge branch 'llvm:main' into select-case-hlfir-cmpchar
eugeneepshteyn Nov 19, 2025
4529460
Copied the test file from select-case-statement-test branch
eugeneepshteyn Nov 19, 2025
e994e69
removed extraneous code
eugeneepshteyn Nov 20, 2025
f5f5a9a
Merge branch 'llvm:main' into select-case-hlfir-cmpchar
eugeneepshteyn Nov 20, 2025
584764b
Fixed test/Lower/select-case-statement.f90 to support new character c…
eugeneepshteyn Nov 21, 2025
ede5171
Merge branch 'llvm:main' into select-case-hlfir-cmpchar
eugeneepshteyn Nov 21, 2025
fd5e83e
Another test tweak
eugeneepshteyn Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions flang/lib/Lower/Bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3926,14 +3926,8 @@ class FirConverter : public Fortran::lower::AbstractConverter {
if (!isCharSelector)
return mlir::arith::CmpIOp::create(*builder, loc, pred, selector,
rhs);
fir::factory::CharacterExprHelper charHelper{*builder, loc};
std::pair<mlir::Value, mlir::Value> lhsVal =
charHelper.createUnboxChar(selector);
std::pair<mlir::Value, mlir::Value> rhsVal =
charHelper.createUnboxChar(rhs);
return fir::runtime::genCharCompare(*builder, loc, pred, lhsVal.first,
lhsVal.second, rhsVal.first,
rhsVal.second);
else
return hlfir::CmpCharOp::create(*builder, loc, pred, selector, rhs);
};
mlir::Block *newBlock = insertBlock(*caseBlock);
if (mlir::isa<fir::ClosedIntervalAttr>(attr)) {
Expand Down
142 changes: 94 additions & 48 deletions flang/test/Lower/select-case-statement.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,31 +119,55 @@ subroutine scharacter(c)
select case (c)
case default
nn = -1
! CHECK: CharacterCompareScalar1
! CHECK-NEXT: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! NOTE: common pattern of character comparison: at -O0, runtime function
! is called, followed by comparison of i32 values. At -O1 and above,
! inline comparison code is done using loops. The comparison code ends
! with comparison of i8 values. At either -O0 or -O1, the comparison
! ends with a conditional branch. This comparison pattern is used
! throughout this file.
!
! <= 'd'
! CHECK-O0: CharacterCompareScalar1
! CHECK-O0-NEXT: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case (:'d')
nn = 10
! CHECK: CharacterCompareScalar1
! CHECK-NEXT: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! 'ff' <= ... <= 'ffff'
! CHECK-O0: CharacterCompareScalar1
! CHECK-O0-NEXT: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
! CHECK: CharacterCompareScalar1
! CHECK-NEXT: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! CHECK-O0: CharacterCompareScalar1
! CHECK-O0-NEXT: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case ('ff':'ffff')
nn = 20
! CHECK: CharacterCompareScalar1
! CHECK-NEXT: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! == 'm'
! CHECK-O0: CharacterCompareScalar1
! CHECK-O0-NEXT: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case ('m')
nn = 30
! CHECK: CharacterCompareScalar1
! CHECK-NEXT: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! == 'qq'
! CHECK-O0: CharacterCompareScalar1
! CHECK-O0-NEXT: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case ('qq')
nn = 40
! CHECK: CharacterCompareScalar1
! CHECK-NEXT: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! >= 'x'
! CHECK-O0: CharacterCompareScalar1
! CHECK-O0-NEXT: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case ('x':)
nn = 50
Expand All @@ -159,14 +183,11 @@ subroutine scharacter1(s)
! CHECK: %[[STR00:[0-9]+]] = fir.declare {{.*}} uniq_name = "_QQclX3030"}
! CHECK: %[[STR00_CONV:[0-9]+]] = fir.convert %[[STR00]]

! At -O1, lge() is lowered to various loops and "if" statements that work
! with "00". It's not our goal to completely test lge() lowering here,
! since this file is about testing SELECT CASE.
! CHECK-O1: fir.do_loop
! At -O0, we call runtime function for character comparison.
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR00_CONV]]
! CHECK-O0-NEXT: arith.cmpi sge, {{.*}}, %c0_i32 : i32
! CHECK-O0-NEXT: cf.cond_br
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
if (lge(s,'00')) then

! CHECK: fir.call @_FortranATrim
Expand All @@ -182,9 +203,11 @@ subroutine scharacter1(s)
! CHECK: %[[STR88:[0-9]+]] = fir.declare {{.*}} uniq_name = "_QQclX3838"}

! == '11'
! CHECK: %[[STR11_CONV:[0-9]+]] = fir.convert %[[STR11]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR11_CONV]]
! CHECK-NEXT: arith.cmpi eq
! CHECK-O0: %[[STR11_CONV:[0-9]+]] = fir.convert %[[STR11]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR11_CONV]]
! CHECK-O0-NEXT: arith.cmpi eq,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
select case(trim(s))
case('11')
Expand All @@ -194,45 +217,59 @@ subroutine scharacter1(s)
continue

! == '22'
! CHECK: %[[STR22_CONV:[0-9]+]] = fir.convert %[[STR22]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR22_CONV]]
! CHECK-NEXT: arith.cmpi eq,{{.*}}, %c0_i32 : i32
! CHECK-O0: %[[STR22_CONV:[0-9]+]] = fir.convert %[[STR22]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR22_CONV]]
! CHECK-O0-NEXT: arith.cmpi eq,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case('22')
n = 2

! == '33'
! CHECK: %[[STR33_CONV:[0-9]+]] = fir.convert %[[STR33]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR33_CONV]]
! CHECK-NEXT: arith.cmpi eq,{{.*}}, %c0_i32 : i32
! CHECK-O0: %[[STR33_CONV:[0-9]+]] = fir.convert %[[STR33]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR33_CONV]]
! CHECK-O0-NEXT: arith.cmpi eq,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case('33')
n = 3

! >= '44'
! CHECK: %[[STR44_CONV:[0-9]+]] = fir.convert %[[STR44]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR44_CONV]]
! CHECK-NEXT: arith.cmpi sge,{{.*}}, %c0_i32 : i32
! CHECK-O0: %[[STR44_CONV:[0-9]+]] = fir.convert %[[STR44]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR44_CONV]]
! CHECK-O0-NEXT: arith.cmpi sge,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
! <= '55'
! CHECK: %[[STR55_CONV:[0-9]+]] = fir.convert %[[STR55]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR55_CONV]]
! CHECK-NEXT: arith.cmpi sle,{{.*}}, %c0_i32 : i32
! CHECK-O0: %[[STR55_CONV:[0-9]+]] = fir.convert %[[STR55]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR55_CONV]]
! CHECK-O0-NEXT: arith.cmpi sle,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
! >= '66'
! CHECK: %[[STR66_CONV:[0-9]+]] = fir.convert %[[STR66]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR66_CONV]]
! CHECK-NEXT: arith.cmpi sge,{{.*}}, %c0_i32 : i32
! CHECK-O0: %[[STR66_CONV:[0-9]+]] = fir.convert %[[STR66]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR66_CONV]]
! CHECK-O0-NEXT: arith.cmpi sge,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
! <= '77'
! CHECK: %[[STR77_CONV:[0-9]+]] = fir.convert %[[STR77]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR77_CONV]]
! CHECK-NEXT: arith.cmpi sle,{{.*}}, %c0_i32 : i32
! CHECK-O0: %[[STR77_CONV:[0-9]+]] = fir.convert %[[STR77]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR77_CONV]]
! CHECK-O0-NEXT: arith.cmpi sle,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sle, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
! >= '88'
! CHECK: %[[STR88_CONV:[0-9]+]] = fir.convert %[[STR88]]
! CHECK: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR88_CONV]]
! CHECK-NEXT: arith.cmpi sge,{{.*}}, %c0_i32 : i32
! CHECK-O0: %[[STR88_CONV:[0-9]+]] = fir.convert %[[STR88]]
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1({{.*}}, %[[STR88_CONV]]
! CHECK-O0-NEXT: arith.cmpi sge,{{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi sge, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case('44':'55','66':'77','88':)
n = 4
Expand Down Expand Up @@ -285,14 +322,20 @@ subroutine sempty(n)
print*, n, 'i:case default'
end select
select case (char(ichar('0')+n))
! CHECK: fir.call @_FortranACharacterCompareScalar1(
! CHECK-NEXT: arith.cmpi eq, {{.*}}, %c0_i32 : i32
! == '1'
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1(
! CHECK-O0-NEXT: arith.cmpi eq, {{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
case ('1')
print*, n, 'c:case 1'
case ('2')
! CHECK: fir.call @_FortranACharacterCompareScalar1(
! CHECK-NEXT: arith.cmpi eq, {{.*}}, %c0_i32 : i32
! == '2'
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1(
! CHECK-O0-NEXT: arith.cmpi eq, {{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
! CHECK-NEXT: cf.cond_br
! (empty) print*, n, 'c:case 2'
case default
Expand Down Expand Up @@ -383,8 +426,11 @@ subroutine snested(str)
if (present(str)) then
! CHECK: fir.call @_FortranATrim
select case (trim(str))
! CHECK: fir.call @_FortranACharacterCompareScalar1
! CHECK-NEXT: arith.cmpi eq, {{.*}}, %c0_i32 : i32
! == 'a'
! CHECK-O0: fir.call @_FortranACharacterCompareScalar1
! CHECK-O0-NEXT: arith.cmpi eq, {{.*}}, %c0_i32 : i32
! CHECK-O1: fir.do_loop {{.*}} -> (i8) {
! CHECK-O1: arith.cmpi eq, %{{[0-9]+}}, %c{{[0-9]+}}_i8 : i8
case ('a')
! CHECK-DAG: fir.store %c10_i32 to {{.*}} : !fir.ref<i32>
num = 10
Expand Down