Skip to content

Commit 1b908ad

Browse files
yiwu0b11yiwu0b11
committed
add tests
1 parent 836cd28 commit 1b908ad

File tree

3 files changed

+75
-43
lines changed

3 files changed

+75
-43
lines changed

‎flang/lib/Optimizer/Builder/IntrinsicCall.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5923,7 +5923,7 @@ IntrinsicLibrary::genSum(mlir::Type resultType,
59235923

59245924
// SYSTEM
59255925
void IntrinsicLibrary::genSystem(llvm::ArrayRef<fir::ExtendedValue> args) {
5926-
assert(args.size() >= 1 && args.size()<=2);
5926+
assert(args.size() >= 1 && args.size() <= 2);
59275927
mlir::Value command = fir::getBase(args[0]);
59285928
const fir::ExtendedValue &exitstat = args[1];
59295929

@@ -5939,8 +5939,14 @@ void IntrinsicLibrary::genSystem(llvm::ArrayRef<fir::ExtendedValue> args) {
59395939
: builder.create<fir::AbsentOp>(loc, boxNoneTy).getResult();
59405940

59415941
// Create a dummmy cmdstat to prevent EXECUTE_COMMAND_LINE terminate itself
5942-
// when cmdstat is assigned with a non-zero value but not present
5943-
mlir::Value cmdstatBox = builder.createBox(loc, builder.createIntegerConstant(loc, builder.getIndexType(), 0));
5942+
// when cmdstat is assigned with a non-zero value but not present
5943+
mlir::Value tempValue =
5944+
builder.createIntegerConstant(loc, builder.getI2Type(), 0);
5945+
mlir::Value temp = builder.createTemporary(loc, builder.getI2Type());
5946+
mlir::Value castVal =
5947+
builder.createConvert(loc, builder.getI2Type(), tempValue);
5948+
builder.create<fir::StoreOp>(loc, castVal, temp);
5949+
mlir::Value cmdstatBox = builder.createBox(loc, temp);
59445950

59455951
mlir::Value cmdmsgBox =
59465952
builder.create<fir::AbsentOp>(loc, boxNoneTy).getResult();

‎flang/test/Lower/Intrinsics/system-optional.f90

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
11
! RUN: bbc -emit-hlfir %s -o - | FileCheck %s
22

33
! CHECK-LABEL: func.func @_QPall_args(
4-
! CHECK-SAME: %[[commandArg:.*]]: !fir.boxchar<1> {fir.bindc_name = "command", fir.optional},
5-
! CHECK-SAME: %[[exitvalArg:.*]]: !fir.ref<i32> {fir.bindc_name = "exitval", fir.optional}) {
6-
subroutine all_args(command, exitVal)
4+
! CHECK-SAME: %[[commandArg:.*]]: !fir.boxchar<1> {fir.bindc_name = "command", fir.optional},
5+
! CHECK-SAME: %[[exitstatArg:.*]]: !fir.ref<i32> {fir.bindc_name = "exitstat", fir.optional}) {
6+
subroutine all_args(command, exitstat)
77
CHARACTER(*), OPTIONAL :: command
8-
INTEGER, OPTIONAL :: exitVal
9-
call system(command, exitVal)
10-
! CHECK-NEXT: %[[commandUnbox:.*]]:2 = fir.unboxchar %[[commandArg]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
11-
! CHECK-NEXT: %[[commandDeclare:.*]]:2 = hlfir.declare %[[commandUnbox]]#0 typeparams %[[commandUnbox]]#1 {fortran_attrs = #fir.var_attrs<optional>, uniq_name = "_QFall_argsEcommand"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
12-
! CHECK-NEXT: %[[exitvalDeclare:.*]]:2 = hlfir.declare %[[exitvalArg]] {fortran_attrs = #fir.var_attrs<optional>, uniq_name = "_QFall_argsEexitval"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
13-
! CHECK-NEXT: %[[exitvalIsPresent:.*]] = fir.is_present %[[exitvalDeclare]]#0 : (!fir.ref<i32>) -> i1
8+
INTEGER, OPTIONAL :: exitstat
9+
call system(command, exitstat)
10+
11+
! CHECK-NEXT: %[[cmdstatVal:.*]] = fir.alloca i2
12+
! CHECK-NEXT: %[[commandUnbox:.*]]:2 = fir.unboxchar %[[commandArg]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
13+
! CHECK-NEXT: %[[commandDeclare:.*]]:2 = hlfir.declare %[[commandUnbox]]#0 typeparams %[[commandUnbox]]#1 {fortran_attrs = #fir.var_attrs<optional>, uniq_name = "_QFall_argsEcommand"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
14+
! CHECK-NEXT: %[[exitstatDeclare:.*]]:2 = hlfir.declare %[[exitstatArg]] {fortran_attrs = #fir.var_attrs<optional>, uniq_name = "_QFall_argsEexitstat"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
15+
! CHECK-NEXT: %[[exitstatIsPresent:.*]] = fir.is_present %[[exitstatDeclare]]#0 : (!fir.ref<i32>) -> i1
1416
! CHECK-NEXT: %[[commandBox:.*]] = fir.embox %[[commandDeclare]]#1 typeparams %[[commandUnbox]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
15-
! CHECK-NEXT: %[[exitvalBox:.*]] = fir.embox %[[exitvalDeclare]]#1 : (!fir.ref<i32>) -> !fir.box<i32>
16-
! CHECK-NEXT: %[[absentBox:.*]] = fir.absent !fir.box<i32>
17-
! CHECK-NEXT: %[[exitvalSelect:.*]] = arith.select %[[exitvalIsPresent]], %[[exitvalBox]], %[[absentBox]] : !fir.box<i32>
18-
! CHECK: %c9_i32 = arith.constant 9 : i32
17+
! CHECK-NEXT: %[[exitstatBox:.*]] = fir.embox %[[exitstatDeclare]]#1 : (!fir.ref<i32>) -> !fir.box<i32>
18+
! CHECK-NEXT: %[[absentIntBox:.*]] = fir.absent !fir.box<i32>
19+
! CHECK-NEXT: %[[exitstatRealBox:.*]] = arith.select %[[exitstatIsPresent]], %[[exitstatBox]], %[[absentIntBox]] : !fir.box<i32>
20+
! CHECK-NEXT: %[[true:.*]] = arith.constant true
21+
! CHECK-NEXT: %[[c0_i2:.*]] = arith.constant 0 : i2
22+
! CHECK-NEXT: fir.store %[[c0_i2]] to %[[cmdstatVal]] : !fir.ref<i2>
23+
! CHECK-NEXT: %[[cmdstatBox:.*]] = fir.embox %[[cmdstatVal]] : (!fir.ref<i2>) -> !fir.box<i2>
24+
! CHECK-NEXT: %[[absentBox:.*]] = fir.absent !fir.box<none>
25+
! CHECK: %[[c9_i32:.*]] = arith.constant 9 : i32
1926
! CHECK-NEXT: %[[command:.*]] = fir.convert %[[commandBox]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
20-
! CHECK-NEXT: %[[exitval:.*]] = fir.convert %[[exitvalSelect]] : (!fir.box<i32>) -> !fir.box<none>
21-
! CHECK: %[[VAL_12:.*]] = fir.call @_FortranASystem(%[[command]], %[[exitval]], %[[VAL_11:.*]], %c9_i32) fastmath<contract> : (!fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> none
27+
! CHECK-NEXT: %[[exitstat:.*]] = fir.convert %[[exitstatRealBox]] : (!fir.box<i32>) -> !fir.box<none>
28+
! CHECK-NEXT: %[[cmdstat:.*]] = fir.convert %[[cmdstatBox]] : (!fir.box<i2>) -> !fir.box<none>
29+
! CHECK-NEXT: %[[VAL_15:.*]] = fir.convert %[[VAL_11:.*]] : (!fir.ref<!fir.char<1,82>>) -> !fir.ref<i8>
30+
! CHECK-NEXT: %[[VAL_16:.*]] = fir.call @_FortranAExecuteCommandLine(%[[command]], %[[true]], %[[exitstat]], %[[cmdstat]], %[[absentBox]], %[[VAL_15]], %[[c9_i32]]) fastmath<contract> : (!fir.box<none>, i1, !fir.box<none>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> none
2231
! CHECK-NEXT: return
23-
! CHECK-NEXT: }
32+
! CHECK-NEXT: }
33+
2434
end subroutine all_args

‎flang/test/Lower/Intrinsics/system.f90

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,52 @@
22

33
! CHECK-LABEL: func.func @_QPall_args(
44
! CHECK-SAME: %[[commandArg:.*]]: !fir.boxchar<1> {fir.bindc_name = "command"},
5-
! CHECK-SAME: %[[exitvalArg:.*]]: !fir.ref<i32> {fir.bindc_name = "exitval"}) {
6-
subroutine all_args(command, exitVal)
5+
! CHECK-SAME: %[[exitstatArg:.*]]: !fir.ref<i32> {fir.bindc_name = "exitstat"}) {
6+
subroutine all_args(command, exitstat)
77
CHARACTER(*) :: command
8-
INTEGER :: exitVal
9-
call system(command, exitVal)
10-
! CHECK-NEXT: %[[commandUnbox:.*]]:2 = fir.unboxchar %[[commandArg]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
11-
! CHECK-NEXT: %[[commandDeclare:.*]]:2 = hlfir.declare %[[commandUnbox]]#0 typeparams %[[commandUnbox]]#1 {uniq_name = "_QFall_argsEcommand"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
12-
! CHECK-NEXT: %[[exitvalDeclare:.*]]:2 = hlfir.declare %[[exitvalArg]] {uniq_name = "_QFall_argsEexitval"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
13-
! CHECK-NEXT: %[[commandBox:.*]] = fir.embox %[[commandDeclare]]#1 typeparams %[[commandUnbox]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
14-
! CHECK-NEXT: %[[exitvalBox:.*]] = fir.embox %[[exitvalDeclare]]#1 : (!fir.ref<i32>) -> !fir.box<i32>
15-
! CHECK: %c9_i32 = arith.constant 9 : i32
16-
! CHECK-NEXT: %[[command:.*]] = fir.convert %[[commandBox]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
17-
! CHECK-NEXT: %[[exitval:.*]] = fir.convert %[[exitvalBox]] : (!fir.box<i32>) -> !fir.box<none>
18-
! CHECK: %[[VAL_9:.*]] = fir.call @_FortranASystem(%[[command]], %[[exitval]], %[[VAL_8:.*]], %c9_i32) fastmath<contract> : (!fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> none
19-
! CHECK-NEXT: return
20-
! CHECK-NEXT: }
8+
INTEGER :: exitstat
9+
call system(command, exitstat)
10+
! CHECK-NEXT: %[[cmdststVal:.*]] = fir.alloca i2
11+
! CHECK-NEXT: %[[commandUnbox:.*]]:2 = fir.unboxchar %[[commandArg]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
12+
! CHECK-NEXT: %[[commandDeclare:.*]]:2 = hlfir.declare %[[commandUnbox]]#0 typeparams %[[commandUnbox]]#1 {uniq_name = "_QFall_argsEcommand"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
13+
! CHECK-NEXT: %[[exitstatDeclare:.*]]:2 = hlfir.declare %[[exitstatArg]] {uniq_name = "_QFall_argsEexitstat"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
14+
! CHECK-NEXT: %[[commandBox:.*]] = fir.embox %[[commandDeclare]]#1 typeparams %[[commandUnbox]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
15+
! CHECK-NEXT: %[[exitstatBox:.*]] = fir.embox %[[exitstatDeclare]]#1 : (!fir.ref<i32>) -> !fir.box<i32>
16+
! CHECK-NEXT: %[[true:.*]] = arith.constant true
17+
! CHECK-NEXT: %[[c0_i2:.*]] = arith.constant 0 : i2
18+
! CHECK-NEXT: fir.store %[[c0_i2:.*]] to %[[cmdststVal]] : !fir.ref<i2>
19+
! CHECK-NEXT: %[[cmdstatBox:.*]] = fir.embox %[[cmdststVal]] : (!fir.ref<i2>) -> !fir.box<i2>
20+
! CHECK-NEXT: %[[absentBox:.*]] = fir.absent !fir.box<none>
21+
! CHECK: %[[c9_i32:.*]] = arith.constant 9 : i32
22+
! CHECK-NEXT: %[[command:.*]] = fir.convert %[[commandBox]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
23+
! CHECK-NEXT: %[[exitstat:.*]] = fir.convert %[[exitstatBox]] : (!fir.box<i32>) -> !fir.box<none>
24+
! CHECK-NEXT: %[[cmdstat:.*]] = fir.convert %[[cmdstatBox]] : (!fir.box<i2>) -> !fir.box<none>
25+
! CHECK-NEXT: %[[VAL_12:.*]] = fir.convert %[[VAL_8:.*]] : (!fir.ref<!fir.char<1,73>>) -> !fir.ref<i8>
26+
! CHECK-NEXT: %[[VAL_13:.*]] = fir.call @_FortranAExecuteCommandLine(%[[command]], %[[true]], %[[exitstat]], %[[cmdstat]], %[[absentBox]], %[[VAL_12]], %[[c9_i32]]) fastmath<contract> : (!fir.box<none>, i1, !fir.box<none>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> none
27+
! CHECK-NEXT: return
28+
! CHECK-NEXT: }
2129
end subroutine all_args
2230

2331
! CHECK-LABEL: func.func @_QPonly_command(
2432
! CHECK-SAME: %[[commandArg:.*]]: !fir.boxchar<1> {fir.bindc_name = "command"}) {
2533
subroutine only_command(command)
2634
CHARACTER(*) :: command
2735
call system(command)
28-
! CHECK-NEXT: %[[commandUnbox:.*]]:2 = fir.unboxchar %[[commandArg]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
29-
! CHECK-NEXT: %[[commandDeclare:.*]]:2 = hlfir.declare %[[commandUnbox]]#0 typeparams %[[commandUnbox]]#1 {uniq_name = "_QFonly_commandEcommand"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
30-
! CHECK-NEXT: %[[commandBox:.*]] = fir.embox %[[commandDeclare]]#1 typeparams %[[commandUnbox]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
31-
! CHECK-NEXT: %[[absentBox:.*]] = fir.absent !fir.box<none>
32-
! CHECK: %c27_i32 = arith.constant 27 : i32
33-
! CHECK-NEXT: %[[command:.*]] = fir.convert %[[commandBox]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
34-
! CHECK: %[[VAL_7:.*]] = fir.call @_FortranASystem(%[[command]], %[[absentBox]], %[[VAL_6:.*]], %c27_i32) fastmath<contract> : (!fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> none
35-
! CHECK-NEXT: return
36-
! CHECK-NEXT: }
36+
! CHECK-NEXT: %[[cmdstatVal:.*]] = fir.alloca i2
37+
! CHECK-NEXT: %[[commandUnbox:.*]]:2 = fir.unboxchar %arg0 : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
38+
! CHECK-NEXT: %[[commandDeclare:.*]]:2 = hlfir.declare %[[commandUnbox]]#0 typeparams %[[commandUnbox]]#1 {uniq_name = "_QFonly_commandEcommand"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
39+
! CHECK-NEXT: %[[commandBox:.*]] = fir.embox %[[commandDeclare]]#1 typeparams %[[commandUnbox]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
40+
! CHECK-NEXT: %[[true:.*]] = arith.constant true
41+
! CHECK-NEXT: %[[absentBox:.*]] = fir.absent !fir.box<none>
42+
! CHECK-NEXT: %[[c0_i2:.*]] = arith.constant 0 : i2
43+
! CHECK-NEXT: fir.store %[[c0_i2:.*]] to %[[cmdstatVal]] : !fir.ref<i2>
44+
! CHECK-NEXT: %[[cmdstatBox:.*]] = fir.embox %[[cmdstatVal]] : (!fir.ref<i2>) -> !fir.box<i2>
45+
! CHECK-NEXT: %[[absentBox2:.*]] = fir.absent !fir.box<none>
46+
! CHECK: %[[c35_i32:.*]] = arith.constant 35 : i32
47+
! CHECK-NEXT: %[[command:.*]] = fir.convert %[[commandBox]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
48+
! CHECK-NEXT: %[[cmdstst:.*]] = fir.convert %[[cmdstatBox]] : (!fir.box<i2>) -> !fir.box<none>
49+
! CHECK-NEXT: %[[VAL_10:.*]]0 = fir.convert %[[VAL_7:.*]] : (!fir.ref<!fir.char<1,73>>) -> !fir.ref<i8>
50+
! CHECK-NEXT: %[[VAL_11:.*]]1 = fir.call @_FortranAExecuteCommandLine(%[[command]], %[[true]], %[[absentBox]], %[[cmdstst]], %[[absentBox2]], %[[VAL_10]]0, %[[c35_i32]]) fastmath<contract> : (!fir.box<none>, i1, !fir.box<none>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> none
51+
! CHECK-NEXT: return
52+
! CHECK-NEXT: }
3753
end subroutine only_command

0 commit comments

Comments
 (0)