Skip to content

Commit d3f6b1f

Browse files
authored
[flang] enable maxloc and minloc tests on AIX (#218)
The affected tests are enabled after issue 110921 is fixed.
1 parent c9d3b5a commit d3f6b1f

File tree

2 files changed

+14
-57
lines changed

2 files changed

+14
-57
lines changed

Fortran/gfortran/regression/override.yaml

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -137,49 +137,6 @@
137137
"zero_sized_14.f90":
138138
disabled_on: ["powerpc-*-aix"]
139139

140-
# incorrect inlining for minloc/maxloc on AIX
141-
"maxloc_2.f90":
142-
disabled_on: ["powerpc-*-aix"]
143-
144-
"maxloc_3.f90":
145-
disabled_on: ["powerpc-*-aix"]
146-
147-
"maxlocval_3.f90":
148-
disabled_on: ["powerpc-*-aix"]
149-
150-
"minloc_1.f90":
151-
disabled_on: ["powerpc-*-aix"]
152-
153-
"minloc_2.f90":
154-
disabled_on: ["powerpc-*-aix"]
155-
156-
"minlocval_1.f90":
157-
disabled_on: ["powerpc-*-aix"]
158-
159-
"minlocval_2.f90":
160-
disabled_on: ["powerpc-*-aix"]
161-
162-
"minlocval_4.f90":
163-
disabled_on: ["powerpc-*-aix"]
164-
165-
"minmaxloc_10.f90":
166-
disabled_on: ["powerpc-*-aix"]
167-
168-
"minmaxloc_17.f90":
169-
disabled_on: ["powerpc-*-aix"]
170-
171-
"minmaxloc_1.f90":
172-
disabled_on: ["powerpc-*-aix"]
173-
174-
"minmaxloc_3.f90":
175-
disabled_on: ["powerpc-*-aix"]
176-
177-
"scalar_mask_1.f90":
178-
disabled_on: ["powerpc-*-aix"]
179-
180-
"scalar_mask_2.f90":
181-
disabled_on: ["powerpc-*-aix"]
182-
183140
# libm's routine lround returns incorrect values on AIX
184141
"nint_2.f90":
185142
disabled_on: ["powerpc-*-aix"]

Fortran/gfortran/regression/tests.cmake

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5235,8 +5235,8 @@ run;matmul_bounds_8.f90;xfail;-fno-backtrace -fbounds-check -fno-realloc-lhs;;
52355235
run;matmul_bounds_9.f90;xfail;-fbounds-check -ffrontend-optimize;;
52365236
run;matmul_const.f90;;-fno-frontend-optimize -fdump-tree-original;;
52375237
run;maxloc_1.f90;;;;
5238-
run;maxloc_2.f90;;;;powerpc-.+-aix
5239-
run;maxloc_3.f90;;;;powerpc-.+-aix
5238+
run;maxloc_2.f90;;;;
5239+
run;maxloc_3.f90;;;;
52405240
run;maxloc_4.f90;;;;
52415241
run;maxloc_5.f90;;;;
52425242
run;maxloc_bounds_1.f90;xfail;-fbounds-check;;
@@ -5250,7 +5250,7 @@ run;maxloc_bounds_8.f90;xfail;-fbounds-check;;
52505250
run;maxloc_string_1.f90;;;;
52515251
run;maxlocval_1.f90;;;;aarch64-.+-.+
52525252
run;maxlocval_2.f90;;;;
5253-
run;maxlocval_3.f90;;;;powerpc-.+-aix
5253+
run;maxlocval_3.f90;;;;
52545254
run;maxlocval_4.f90;;;;
52555255
run;maxval_char_1.f90;;;;
52565256
run;maxval_char_2.f90;;;;
@@ -5271,26 +5271,26 @@ run;min_max_optional_1.f90;;;;
52715271
run;min_max_optional_5.f90;;;;
52725272
run;min_max_type.f90;;;;
52735273
run;min_max_type_2.f90;;;;
5274-
run;minloc_1.f90;;;;powerpc-.+-aix
5275-
run;minloc_2.f90;;;;powerpc-.+-aix
5274+
run;minloc_1.f90;;;;
5275+
run;minloc_2.f90;;;;
52765276
run;minloc_3.f90;;;;
52775277
run;minloc_4.f90;;;;
52785278
run;minloc_5.f90;;;;
52795279
run;minloc_string_1.f90;;;;
5280-
run;minlocval_1.f90;;;;powerpc-.+-aix
5281-
run;minlocval_2.f90;;;;powerpc-.+-aix
5280+
run;minlocval_1.f90;;;;
5281+
run;minlocval_2.f90;;;;
52825282
run;minlocval_3.f90;;;;
5283-
run;minlocval_4.f90;;;;powerpc-.+-aix
5283+
run;minlocval_4.f90;;;;
52845284
run;minmax_char_1.f90;;;;
5285-
run;minmaxloc_1.f90;;;;powerpc-.+-aix
5286-
run;minmaxloc_10.f90;;-fdefault-integer-8;;powerpc-.+-aix
5285+
run;minmaxloc_1.f90;;;;
5286+
run;minmaxloc_10.f90;;-fdefault-integer-8;;
52875287
run;minmaxloc_11.f90;;;;
52885288
run;minmaxloc_12.f90;;;;
52895289
run;minmaxloc_13.f90;;;;
52905290
run;minmaxloc_16.f90;;-fdump-tree-original;;
5291-
run;minmaxloc_17.f90;;;;powerpc-.+-aix
5291+
run;minmaxloc_17.f90;;;;
52925292
run;minmaxloc_2.f90;;;;
5293-
run;minmaxloc_3.f90;;-fdefault-integer-8;;powerpc-.+-aix
5293+
run;minmaxloc_3.f90;;-fdefault-integer-8;;
52945294
run;minmaxloc_4.f90;;;;
52955295
run;minmaxloc_5.f90;;;;
52965296
run;minmaxloc_6.f90;;;;
@@ -6090,8 +6090,8 @@ run;save_1.f90;;-O2 -fno-automatic;;
60906090
run;save_2.f90;;-O2 -fno-automatic;;
60916091
run;save_5.f90;;-fno-automatic;;
60926092
run;save_6.f90;;-fno-automatic -flto -g;;
6093-
run;scalar_mask_1.f90;;;;powerpc-.+-aix
6094-
run;scalar_mask_2.f90;;;;powerpc-.+-aix
6093+
run;scalar_mask_1.f90;;;;
6094+
run;scalar_mask_2.f90;;;;
60956095
run;scalarize_parameter_array_1.f90;;;;
60966096
run;scale_1.f90;;;;
60976097
run;scan_1.f90;;;;

0 commit comments

Comments
 (0)