diff --git a/transformations/tests/sources/projSccCuf/module/kernel.f90 b/transformations/tests/sources/projSccCuf/module/kernel.f90 index 5c11fe72f..6a0c5ecb3 100644 --- a/transformations/tests/sources/projSccCuf/module/kernel.f90 +++ b/transformations/tests/sources/projSccCuf/module/kernel.f90 @@ -23,7 +23,7 @@ SUBROUTINE kernel(start, iend, nlon, nz, q, t, z) c = 5.345 DO jk = 2, nz DO jl = start, iend - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO diff --git a/transformations/tests/test_scc_cuf.py b/transformations/tests/test_scc_cuf.py index 0df127e2d..7c4dfed5c 100644 --- a/transformations/tests/test_scc_cuf.py +++ b/transformations/tests/test_scc_cuf.py @@ -198,7 +198,7 @@ def test_scc_cuf_simple(frontend, horizontal, vertical, blocking): c = 5.345 DO jk = 2, nz DO jl = start, end - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO diff --git a/transformations/tests/test_single_column.py b/transformations/tests/test_single_column.py index 63e5b92f4..92b17c00f 100644 --- a/transformations/tests/test_single_column.py +++ b/transformations/tests/test_single_column.py @@ -34,7 +34,7 @@ def test_extract_sca_horizontal(frontend, horizontal): c = 5.345 DO jk = 2, nz DO jl = 1, nlon - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO @@ -52,7 +52,7 @@ def test_extract_sca_horizontal(frontend, horizontal): exp_loop_nest = """ c = 5.345 DO jk=2,nz - t(jk) = c*k + t(jk) = c*jk q(jk) = q(jk - 1) + t(jk)*c END DO """ diff --git a/transformations/tests/test_single_column_coalesced.py b/transformations/tests/test_single_column_coalesced.py index 2638c0dd2..d558cbf6e 100644 --- a/transformations/tests/test_single_column_coalesced.py +++ b/transformations/tests/test_single_column_coalesced.py @@ -69,7 +69,7 @@ def test_scc_revector_transformation(frontend, horizontal): c = 5.345 DO jk = 2, nz DO jl = start, end - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO @@ -105,7 +105,7 @@ def test_scc_revector_transformation(frontend, horizontal): # Ensure all expressions and array indices are unchanged assigns = FindNodes(Assignment).visit(kernel.body) - assert fgen(assigns[1]).lower() == 't(jl, jk) = c*k' + assert fgen(assigns[1]).lower() == 't(jl, jk) = c*jk' assert fgen(assigns[2]).lower() == 'q(jl, jk) = q(jl, jk - 1) + t(jl, jk)*c' assert fgen(assigns[3]).lower() == 'q(jl, nz) = q(jl, nz)*c' @@ -137,7 +137,7 @@ def test_scc_base_resolve_vector_notation(frontend, horizontal): c = 5.345 DO jk = 2, nz - t(start:end, jk) = c * k + t(start:end, jk) = c * jk q(start:end, jk) = q(start:end, jk-1) + t(start:end, jk) * c END DO END SUBROUTINE compute_column @@ -166,7 +166,7 @@ def test_scc_base_resolve_vector_notation(frontend, horizontal): # Ensure all expressions and array indices are unchanged assigns = FindNodes(Assignment).visit(kernel.body) - assert fgen(assigns[1]).lower() == 't(jl, jk) = c*k' + assert fgen(assigns[1]).lower() == 't(jl, jk) = c*jk' assert fgen(assigns[2]).lower() == 'q(jl, jk) = q(jl, jk - 1) + t(jl, jk)*c' @@ -245,7 +245,7 @@ def test_scc_demote_transformation(frontend, horizontal): c = 5.345 DO jk = 2, nz DO jl = start, end - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO @@ -284,7 +284,7 @@ def test_scc_demote_transformation(frontend, horizontal): # Ensure relevant expressions and array indices are unchanged assigns = FindNodes(Assignment).visit(kernel.body) - assert fgen(assigns[1]).lower() == 't(jl, jk) = c*k' + assert fgen(assigns[1]).lower() == 't(jl, jk) = c*jk' assert fgen(assigns[2]).lower() == 'q(jl, jk) = q(jl, jk - 1) + t(jl, jk)*c' assert fgen(assigns[3]).lower() == 'a = q(jl, 1)' assert fgen(assigns[4]).lower() == 'b(1) = q(jl, 2)' @@ -328,7 +328,7 @@ def test_scc_hoist_multiple_kernels(frontend, horizontal, vertical, blocking): c = 5.345 DO jk = 2, nz DO jl = start, end - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO @@ -358,7 +358,7 @@ def test_scc_hoist_multiple_kernels(frontend, horizontal, vertical, blocking): # Ensure all expressions and array indices are unchanged assigns = FindNodes(Assignment).visit(kernel.body) - assert fgen(assigns[1]).lower() == 't(jl, jk) = c*k' + assert fgen(assigns[1]).lower() == 't(jl, jk) = c*jk' assert fgen(assigns[2]).lower() == 'q(jl, jk) = q(jl, jk - 1) + t(jl, jk)*c' assert fgen(assigns[3]).lower() == 'q(jl, nz) = q(jl, nz)*c' @@ -430,7 +430,7 @@ def test_scc_annotate_openacc(frontend, horizontal, vertical, blocking): c = 5.345 DO jk = 2, nz DO jl = start, end - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO @@ -523,7 +523,7 @@ def test_single_column_coalesced_hoist_openacc(frontend, horizontal, vertical, b c = 5.345 DO jk = 2, nz DO jl = start, end - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO @@ -644,7 +644,7 @@ def test_single_column_coalesced_nested(frontend, horizontal, vertical, blocking DO jk = 2, nz DO jl = start, end - t(jl, jk) = c * k + t(jl, jk) = c * jk q(jl, jk) = q(jl, jk-1) + t(jl, jk) * c END DO END DO