diff --git a/test/integration-test/PassStageMerger/Test01_after_ref.json b/test/integration-test/PassStageMerger/Test01_after_ref.json index d9586261..33cb2f28 100644 --- a/test/integration-test/PassStageMerger/Test01_after_ref.json +++ b/test/integration-test/PassStageMerger/Test01_after_ref.json @@ -1,165 +1,139 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 17, + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 18, + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 15, + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 16, + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "19", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 17, + "Fields": { + "field_a0": { + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 18, + "field_a1": { + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 15, + "field_b0": { + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 16, + "field_b1": { + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 38, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { - "accessID": 17, - "extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" - }, - "intend": 2, - "interval": "{ Start : End }", - "name": "field_b0", - "redundant extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -167,13 +141,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "null", @@ -181,13 +154,25 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b0": { + "accessID": 17, + "extents": { + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" + }, + "intend": 2, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" + } + }, + "field_b1": { "accessID": 18, "extents": { "read_access": "null", @@ -195,13 +180,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -242,22 +226,21 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 18, + "Fields": { + "field_a0": { + "accessID": 15, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "null", @@ -265,41 +248,38 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 15, + "field_b0": { + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 17, + "field_b1": { + "accessID": 18, "extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 0, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test01_before_ref.json b/test/integration-test/PassStageMerger/Test01_before_ref.json index 2deea2fb..921db4e8 100644 --- a/test/integration-test/PassStageMerger/Test01_before_ref.json +++ b/test/integration-test/PassStageMerger/Test01_before_ref.json @@ -1,145 +1,133 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 17, + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 18, + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 15, + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 16, + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "19", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 17, + "Fields": { + "field_a0": { + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 18, + "field_a1": { + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 15, + "field_b0": { + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 16, + "field_b1": { + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 38, "Loop": "parallel", "Stage0": { @@ -168,22 +156,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 18, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -191,13 +165,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 18, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -226,22 +212,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -249,13 +221,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test02_after_ref.json b/test/integration-test/PassStageMerger/Test02_after_ref.json index 71930c12..8f1160e1 100644 --- a/test/integration-test/PassStageMerger/Test02_after_ref.json +++ b/test/integration-test/PassStageMerger/Test02_after_ref.json @@ -1,145 +1,133 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 17, + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 18, + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 15, + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : End }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 16, + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "19", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 17, + "Fields": { + "field_a0": { + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 18, + "field_a1": { + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 15, + "field_b0": { + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : End }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 16, + "field_b1": { + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 38, "Loop": "parallel", "Stage0": { @@ -168,22 +156,8 @@ "interval": "{ Start+1 : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 18, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -191,13 +165,25 @@ }, "intend": 2, "interval": "{ Start+1 : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 18, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -226,22 +212,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -249,13 +221,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test02_before_ref.json b/test/integration-test/PassStageMerger/Test02_before_ref.json index 71930c12..8f1160e1 100644 --- a/test/integration-test/PassStageMerger/Test02_before_ref.json +++ b/test/integration-test/PassStageMerger/Test02_before_ref.json @@ -1,145 +1,133 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 17, + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 18, + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 15, + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : End }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 16, + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "19", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 17, + "Fields": { + "field_a0": { + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 18, + "field_a1": { + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 15, + "field_b0": { + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : End }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 16, + "field_b1": { + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 38, "Loop": "parallel", "Stage0": { @@ -168,22 +156,8 @@ "interval": "{ Start+1 : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 18, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -191,13 +165,25 @@ }, "intend": 2, "interval": "{ Start+1 : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 18, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -226,22 +212,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -249,13 +221,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test03_after_ref.json b/test/integration-test/PassStageMerger/Test03_after_ref.json index 7f9fe4ed..b7de63fe 100644 --- a/test/integration-test/PassStageMerger/Test03_after_ref.json +++ b/test/integration-test/PassStageMerger/Test03_after_ref.json @@ -1,151 +1,139 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 17, + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 18, + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 15, + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : Start }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 16, + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "19", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 17, + "Fields": { + "field_a0": { + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 18, + "field_a1": { + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 15, + "field_b0": { + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : Start }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 16, + "field_b1": { + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 38, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_b0": { "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -153,13 +141,12 @@ }, "intend": 2, "interval": "{ Start+1 : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 18, "extents": { "read_access": "null", @@ -167,13 +154,12 @@ }, "intend": 0, "interval": "{ Start+1 : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -197,8 +183,8 @@ "interval": "{ Start+1 : End }" }, "DoMethod1": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -206,13 +192,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "null", @@ -220,13 +205,12 @@ }, "intend": 0, "interval": "{ Start : Start }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 0, "Stmts": [ { @@ -250,22 +234,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -273,27 +243,25 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 18, + "field_a1": { + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b0": { "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -301,13 +269,25 @@ }, "intend": 2, "interval": "{ Start+1 : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 18, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test03_before_ref.json b/test/integration-test/PassStageMerger/Test03_before_ref.json index 295bfea4..eb384924 100644 --- a/test/integration-test/PassStageMerger/Test03_before_ref.json +++ b/test/integration-test/PassStageMerger/Test03_before_ref.json @@ -1,145 +1,133 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 17, + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 18, + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 15, + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : Start }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 16, + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "19", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 17, + "Fields": { + "field_a0": { + "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start+1 : End }", - "name": "field_b0", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 18, + "field_a1": { + "accessID": 16, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", + "interval": "{ Start : Start }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 15, + "field_b0": { + "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, - "interval": "{ Start : Start }", - "name": "field_a0", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 16, + "field_b1": { + "accessID": 18, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", + "interval": "{ Start+1 : End }", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 38, "Loop": "parallel", "Stage0": { @@ -168,22 +156,8 @@ "interval": "{ Start+1 : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 18, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 17, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -191,13 +165,25 @@ }, "intend": 2, "interval": "{ Start+1 : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 18, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -226,22 +212,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -249,13 +221,25 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : Start }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test04_after_ref.json b/test/integration-test/PassStageMerger/Test04_after_ref.json index 2dafeed5..226e0e96 100644 --- a/test/integration-test/PassStageMerger/Test04_after_ref.json +++ b/test/integration-test/PassStageMerger/Test04_after_ref.json @@ -1,8 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -13,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,20 +30,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "23", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -53,13 +49,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 22, "extents": { "read_access": "null", @@ -67,19 +62,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 50, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -87,13 +81,12 @@ }, "intend": 2, "interval": "{ End : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 22, "extents": { "read_access": "null", @@ -101,13 +94,12 @@ }, "intend": 0, "interval": "{ End : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 2, "Stmts": [ { @@ -131,8 +123,8 @@ "interval": "{ End : End }" }, "DoMethod1": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -140,13 +132,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 22, "extents": { "read_access": "null", @@ -154,13 +145,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -184,8 +174,8 @@ "interval": "{ Start+1 : End-1 }" }, "DoMethod2": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -193,13 +183,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 22, "extents": { "read_access": "null", @@ -207,13 +196,12 @@ }, "intend": 0, "interval": "{ Start : Start }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 0, "Stmts": [ { @@ -237,22 +225,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 22, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -260,13 +234,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 22, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test04_before_ref.json b/test/integration-test/PassStageMerger/Test04_before_ref.json index 5c552ef6..78c381a5 100644 --- a/test/integration-test/PassStageMerger/Test04_before_ref.json +++ b/test/integration-test/PassStageMerger/Test04_before_ref.json @@ -1,8 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -13,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,20 +30,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "23", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -53,13 +49,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 22, "extents": { "read_access": "null", @@ -67,13 +62,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 50, "Loop": "parallel", "Stage0": { @@ -102,22 +96,8 @@ "interval": "{ End : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 22, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ End : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -125,13 +105,25 @@ }, "intend": 2, "interval": "{ End : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 22, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ End : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -160,22 +152,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 22, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -183,13 +161,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 22, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage2": { @@ -218,22 +208,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 22, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 21, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -241,13 +217,25 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 22, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : Start }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test05_after_ref.json b/test/integration-test/PassStageMerger/Test05_after_ref.json index 8fb3b83a..329721e7 100644 --- a/test/integration-test/PassStageMerger/Test05_after_ref.json +++ b/test/integration-test/PassStageMerger/Test05_after_ref.json @@ -1,27 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { - "IsTemporary": false, - "dim": "[1,1,1]", - "field": { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - "name": "field_a2" - }, - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +30,16 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" - } - ], - "ID": "18", - "MultiStage0": { - "Caches": null, - "Fields": [ - { + } + }, + "field_a2": { + "IsTemporary": false, + "dim": "[1,1,1]", + "field": { "accessID": 17, "extents": { "read_access": "null", @@ -72,13 +47,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - { + } + } + }, + "ID": "18", + "MultiStage0": { + "Caches": null, + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -86,13 +66,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -100,13 +79,25 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "ID": 37, "Loop": "parallel", "Stage0": { @@ -135,22 +126,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -158,13 +135,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -193,22 +182,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -216,13 +191,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test05_before_ref.json b/test/integration-test/PassStageMerger/Test05_before_ref.json index 8fb3b83a..329721e7 100644 --- a/test/integration-test/PassStageMerger/Test05_before_ref.json +++ b/test/integration-test/PassStageMerger/Test05_before_ref.json @@ -1,27 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { - "IsTemporary": false, - "dim": "[1,1,1]", - "field": { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - "name": "field_a2" - }, - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +30,16 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" - } - ], - "ID": "18", - "MultiStage0": { - "Caches": null, - "Fields": [ - { + } + }, + "field_a2": { + "IsTemporary": false, + "dim": "[1,1,1]", + "field": { "accessID": 17, "extents": { "read_access": "null", @@ -72,13 +47,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - { + } + } + }, + "ID": "18", + "MultiStage0": { + "Caches": null, + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -86,13 +66,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -100,13 +79,25 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "ID": 37, "Loop": "parallel", "Stage0": { @@ -135,22 +126,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -158,13 +135,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -193,22 +182,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -216,13 +191,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test06_after_ref.json b/test/integration-test/PassStageMerger/Test06_after_ref.json index c01e5ca8..b3ca6a00 100644 --- a/test/integration-test/PassStageMerger/Test06_after_ref.json +++ b/test/integration-test/PassStageMerger/Test06_after_ref.json @@ -1,27 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { - "IsTemporary": false, - "dim": "[1,1,1]", - "field": { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - "name": "field_a2" - }, - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +30,16 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" - } - ], - "ID": "18", - "MultiStage0": { - "Caches": null, - "Fields": [ - { + } + }, + "field_a2": { + "IsTemporary": false, + "dim": "[1,1,1]", + "field": { "accessID": 17, "extents": { "read_access": "null", @@ -72,13 +47,18 @@ }, "intend": 0, "interval": "{ Start+1 : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - { + } + } + }, + "ID": "18", + "MultiStage0": { + "Caches": null, + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -86,13 +66,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -100,19 +79,31 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "ID": 37, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -120,13 +111,12 @@ }, "intend": 2, "interval": "{ Start+1 : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 17, "extents": { "read_access": "null", @@ -134,13 +124,12 @@ }, "intend": 0, "interval": "{ Start+1 : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -164,8 +153,8 @@ "interval": "{ Start+1 : End }" }, "DoMethod1": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -173,13 +162,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "null", @@ -187,13 +175,12 @@ }, "intend": 0, "interval": "{ Start : Start }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 0, "Stmts": [ { @@ -217,8 +204,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -226,41 +213,38 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 17, + "field_a1": { + "accessID": 16, "extents": { - "read_access": "null", + "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_a2", + "intend": 1, + "interval": "{ Start : End }", "redundant extents": { - "read_access": "null", + "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 16, + "field_a2": { + "accessID": 17, "extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, - "interval": "{ Start : End }", - "name": "field_a1", + "intend": 0, + "interval": "{ Start+1 : End }", "redundant extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageMerger/Test06_before_ref.json b/test/integration-test/PassStageMerger/Test06_before_ref.json index 95e38c56..056f4484 100644 --- a/test/integration-test/PassStageMerger/Test06_before_ref.json +++ b/test/integration-test/PassStageMerger/Test06_before_ref.json @@ -1,27 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { - "IsTemporary": false, - "dim": "[1,1,1]", - "field": { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - "name": "field_a2" - }, - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +30,16 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" - } - ], - "ID": "18", - "MultiStage0": { - "Caches": null, - "Fields": [ - { + } + }, + "field_a2": { + "IsTemporary": false, + "dim": "[1,1,1]", + "field": { "accessID": 17, "extents": { "read_access": "null", @@ -72,13 +47,18 @@ }, "intend": 0, "interval": "{ Start+1 : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - { + } + } + }, + "ID": "18", + "MultiStage0": { + "Caches": null, + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -86,13 +66,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -100,13 +79,25 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "ID": 37, "Loop": "parallel", "Stage0": { @@ -135,22 +126,8 @@ "interval": "{ Start+1 : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -158,13 +135,25 @@ }, "intend": 2, "interval": "{ Start+1 : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -193,22 +182,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -216,13 +191,25 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : Start }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test01_after_ref.json b/test/integration-test/PassStageReordering/Test01_after_ref.json index 4e017cb4..3964cbec 100644 --- a/test/integration-test/PassStageReordering/Test01_after_ref.json +++ b/test/integration-test/PassStageReordering/Test01_after_ref.json @@ -1,8 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -13,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,20 +30,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "11", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 9, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -53,13 +49,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 10, "extents": { "read_access": "null", @@ -67,13 +62,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 22, "Loop": "parallel", "Stage0": { @@ -102,22 +96,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 10, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 9, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -125,13 +105,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 10, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test01_before_ref.json b/test/integration-test/PassStageReordering/Test01_before_ref.json index 8283b9bd..511ba0ce 100644 --- a/test/integration-test/PassStageReordering/Test01_before_ref.json +++ b/test/integration-test/PassStageReordering/Test01_before_ref.json @@ -1,8 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -13,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,20 +30,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "11", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 9, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -53,13 +49,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 10, "extents": { "read_access": "null", @@ -67,19 +62,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 20, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 9, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -87,13 +81,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 10, "extents": { "read_access": "null", @@ -101,13 +94,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 0, "Stmts": [ { @@ -131,22 +123,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 10, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 9, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -154,13 +132,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 10, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test02_after_ref.json b/test/integration-test/PassStageReordering/Test02_after_ref.json index 111f61b1..3fd82c9c 100644 --- a/test/integration-test/PassStageReordering/Test02_after_ref.json +++ b/test/integration-test/PassStageReordering/Test02_after_ref.json @@ -1,169 +1,154 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 30, + "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 31, + "accessID": 28, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 32, + "accessID": 29, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b2" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 29, + "accessID": 30, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" } - }, - "name": "field_a2" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 28, + "accessID": 31, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } }, - { + "field_b2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 27, + "accessID": 32, "extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 0, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a0" + } } - ], + }, "ID": "33", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 29, + "Fields": { + "field_a0": { + "accessID": 27, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (0, 0)]", + "write_access": "null" } }, - { - "accessID": 32, + "field_a1": { + "accessID": 28, "extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 0, + "intend": 1, "interval": "{ Start : End }", - "name": "field_b2", "redundant extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 31, + "field_a2": { + "accessID": 29, "extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b0": { "accessID": 30, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -171,41 +156,38 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 28, + "field_b1": { + "accessID": 31, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 27, + "field_b2": { + "accessID": 32, "extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 0, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 68, "Loop": "parallel", "Stage0": { @@ -234,22 +216,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 28, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -257,13 +225,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 28, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -292,22 +272,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 29, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 28, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -315,13 +281,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 29, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage2": { @@ -350,22 +328,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 31, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 30, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -373,13 +337,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 31, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage3": { @@ -408,22 +384,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 32, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_b2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b1": { "accessID": 31, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -431,13 +393,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b2": { + "accessID": 32, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test02_before_ref.json b/test/integration-test/PassStageReordering/Test02_before_ref.json index 058e8b17..e7b70243 100644 --- a/test/integration-test/PassStageReordering/Test02_before_ref.json +++ b/test/integration-test/PassStageReordering/Test02_before_ref.json @@ -1,65 +1,59 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 28, + "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "write_access": "null" }, - "intend": 1, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "write_access": "null" } - }, - "name": "field_a1" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 27, + "accessID": 28, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 1, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a0" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 31, + "accessID": 29, "extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -70,58 +64,52 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 32, + "accessID": 31, "extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 0, + "intend": 1, "interval": "{ Start : End }", - "name": "field_b2", "redundant extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b2" + } }, - { + "field_b2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 29, + "accessID": 32, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a2" + } } - ], + }, "ID": "33", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_b0": { "accessID": 30, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -129,13 +117,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 31, "extents": { "read_access": "null", @@ -143,19 +130,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 60, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_b0": { "accessID": 30, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -163,13 +149,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 31, "extents": { "read_access": "null", @@ -177,13 +162,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 0, "Stmts": [ { @@ -207,22 +191,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 31, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 30, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -230,20 +200,32 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 31, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -251,13 +233,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 28, "extents": { "read_access": "null", @@ -265,19 +246,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 62, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -285,13 +265,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 28, "extents": { "read_access": "null", @@ -299,13 +278,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -329,22 +307,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 28, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -352,20 +316,32 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 28, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage2": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_b1": { "accessID": 31, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -373,13 +349,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b2": { "accessID": 32, "extents": { "read_access": "null", @@ -387,19 +362,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 64, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_b1": { "accessID": 31, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -407,13 +381,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b2": { "accessID": 32, "extents": { "read_access": "null", @@ -421,13 +394,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 2, "Stmts": [ { @@ -451,22 +423,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 32, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_b2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b1": { "accessID": 31, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -474,20 +432,32 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b2": { + "accessID": 32, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage3": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 28, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -495,13 +465,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 29, "extents": { "read_access": "null", @@ -509,19 +478,18 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 66, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 28, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -529,13 +497,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 29, "extents": { "read_access": "null", @@ -543,13 +510,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 3, "Stmts": [ { @@ -573,22 +539,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 29, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 28, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -596,13 +548,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 29, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test03_after_ref.json b/test/integration-test/PassStageReordering/Test03_after_ref.json index 5f266673..2fe7df99 100644 --- a/test/integration-test/PassStageReordering/Test03_after_ref.json +++ b/test/integration-test/PassStageReordering/Test03_after_ref.json @@ -1,27 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { - "IsTemporary": false, - "dim": "[1,1,1]", - "field": { - "accessID": 15, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - "name": "field_b2" - }, - { + "Fields": { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +13,13 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +30,16 @@ }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" - } - ], - "ID": "16", - "MultiStage0": { - "Caches": null, - "Fields": [ - { + } + }, + "field_b2": { + "IsTemporary": false, + "dim": "[1,1,1]", + "field": { "accessID": 15, "extents": { "read_access": "null", @@ -72,13 +47,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - { + } + } + }, + "ID": "16", + "MultiStage0": { + "Caches": null, + "Fields": { + "field_b0": { "accessID": 13, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -86,13 +66,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 14, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -100,13 +79,25 @@ }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } + }, + "field_b2": { + "accessID": 15, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "ID": 35, "Loop": "forward", "Stage0": { @@ -135,22 +126,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 14, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 13, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -158,13 +135,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 14, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -193,22 +182,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 15, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b1": { "accessID": 14, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -216,13 +191,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } + }, + "field_b2": { + "accessID": 15, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test03_before_ref.json b/test/integration-test/PassStageReordering/Test03_before_ref.json index 6707484f..cb2ae80f 100644 --- a/test/integration-test/PassStageReordering/Test03_before_ref.json +++ b/test/integration-test/PassStageReordering/Test03_before_ref.json @@ -1,8 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -13,15 +13,13 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +30,13 @@ }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +47,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b2" + } } - ], + }, "ID": "16", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_b0": { "accessID": 13, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -72,13 +66,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 14, "extents": { "read_access": "null", @@ -86,19 +79,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 31, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_b0": { "accessID": 13, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -106,13 +98,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 14, "extents": { "read_access": "null", @@ -120,13 +111,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -150,22 +140,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 14, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 13, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -173,20 +149,32 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 14, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_b1": { "accessID": 14, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -194,13 +182,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } }, - { + "field_b2": { "accessID": 15, "extents": { "read_access": "null", @@ -208,19 +195,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 32, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_b1": { "accessID": 14, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -228,13 +214,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } }, - { + "field_b2": { "accessID": 15, "extents": { "read_access": "null", @@ -242,13 +227,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 2, "Stmts": [ { @@ -272,22 +256,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 15, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b1": { "accessID": 14, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -295,13 +265,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } + }, + "field_b2": { + "accessID": 15, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test04_after_ref.json b/test/integration-test/PassStageReordering/Test04_after_ref.json index 959c738b..012b2c7d 100644 --- a/test/integration-test/PassStageReordering/Test04_after_ref.json +++ b/test/integration-test/PassStageReordering/Test04_after_ref.json @@ -1,127 +1,115 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 26, + "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 27, + "accessID": 24, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 28, + "accessID": 25, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b2" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 23, + "accessID": 26, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 24, + "accessID": 27, "extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } }, - { + "field_b2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 25, + "accessID": 28, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a2" + } } - ], + }, "ID": "29", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -129,27 +117,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 27, + "field_a1": { + "accessID": 24, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b0": { "accessID": 26, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -157,41 +143,38 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { - "accessID": 28, + "field_b1": { + "accessID": 27, "extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 0, + "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 24, + "field_b2": { + "accessID": 28, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 64, "Loop": "forward", "Stage0": { @@ -220,22 +203,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 24, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -243,13 +212,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 24, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -278,22 +259,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 27, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 26, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -301,13 +268,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 27, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage2": { @@ -336,22 +315,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 28, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b1": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -359,20 +324,32 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } + }, + "field_b2": { + "accessID": 28, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -380,13 +357,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -394,13 +370,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 65, "Loop": "parallel", "Stage0": { @@ -429,22 +404,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 25, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -452,13 +413,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 25, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test04_before_ref.json b/test/integration-test/PassStageReordering/Test04_before_ref.json index 50b1d523..cf7a23b6 100644 --- a/test/integration-test/PassStageReordering/Test04_before_ref.json +++ b/test/integration-test/PassStageReordering/Test04_before_ref.json @@ -1,8 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -13,53 +13,47 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 28, + "accessID": 24, "extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 0, + "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b2" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 27, + "accessID": 25, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_b0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -70,58 +64,52 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } - }, - "name": "field_b0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 24, + "accessID": 27, "extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } }, - { + "field_b2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 25, + "accessID": 28, "extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a2" + } } - ], + }, "ID": "29", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_b0": { "accessID": 26, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -129,13 +117,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 27, "extents": { "read_access": "null", @@ -143,19 +130,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 56, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_b0": { "accessID": 26, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -163,13 +149,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_b1": { "accessID": 27, "extents": { "read_access": "null", @@ -177,13 +162,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 2, "Stmts": [ { @@ -207,22 +191,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 27, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b0": { "accessID": 26, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -230,20 +200,32 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_b1": { + "accessID": 27, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_b1": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -251,13 +233,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } }, - { + "field_b2": { "accessID": 28, "extents": { "read_access": "null", @@ -265,19 +246,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 57, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_b1": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -285,13 +265,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } }, - { + "field_b2": { "accessID": 28, "extents": { "read_access": "null", @@ -299,13 +278,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 3, "Stmts": [ { @@ -329,22 +307,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 28, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_b2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_b1": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -352,20 +316,32 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } + }, + "field_b2": { + "accessID": 28, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage2": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -373,13 +349,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 24, "extents": { "read_access": "null", @@ -387,19 +362,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 60, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -407,13 +381,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 24, "extents": { "read_access": "null", @@ -421,13 +394,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 4, "Stmts": [ { @@ -451,22 +423,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 24, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", @@ -474,20 +432,32 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 24, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage3": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -495,13 +465,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -509,19 +478,18 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 61, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -529,13 +497,12 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -543,13 +510,12 @@ }, "intend": 0, "interval": "{ Start+1 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 5, "Stmts": [ { @@ -573,22 +539,8 @@ "interval": "{ Start+1 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 25, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+1 : End-1 }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -596,13 +548,25 @@ }, "intend": 2, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 25, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+1 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test05_after_ref.json b/test/integration-test/PassStageReordering/Test05_after_ref.json index a7692a79..0e4d3a2b 100644 --- a/test/integration-test/PassStageReordering/Test05_after_ref.json +++ b/test/integration-test/PassStageReordering/Test05_after_ref.json @@ -1,27 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { - "IsTemporary": false, - "dim": "[1,1,1]", - "field": { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+2 : End-1 }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - "name": "field_a2" - }, - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +30,16 @@ }, "intend": 1, "interval": "{ Start : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" - } - ], - "ID": "21", - "MultiStage0": { - "Caches": null, - "Fields": [ - { + } + }, + "field_a2": { + "IsTemporary": false, + "dim": "[1,1,1]", + "field": { "accessID": 17, "extents": { "read_access": "null", @@ -72,13 +47,18 @@ }, "intend": 0, "interval": "{ Start+2 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - { + } + } + }, + "ID": "21", + "MultiStage0": { + "Caches": null, + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -86,13 +66,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -100,13 +79,25 @@ }, "intend": 1, "interval": "{ Start : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+2 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "ID": 40, "Loop": "parallel", "Stage0": { @@ -135,22 +126,8 @@ "interval": "{ Start+2 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+2 : End-1 }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -158,13 +135,25 @@ }, "intend": 2, "interval": "{ Start+2 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+2 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -193,22 +182,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -216,13 +191,25 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : Start }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test05_before_ref.json b/test/integration-test/PassStageReordering/Test05_before_ref.json index f22a74f4..3fef4a09 100644 --- a/test/integration-test/PassStageReordering/Test05_before_ref.json +++ b/test/integration-test/PassStageReordering/Test05_before_ref.json @@ -1,8 +1,8 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -13,15 +13,13 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } - }, - "name": "field_a0" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -32,15 +30,13 @@ }, "intend": 1, "interval": "{ Start : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,20 +47,18 @@ }, "intend": 0, "interval": "{ Start+2 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a2" + } } - ], + }, "ID": "21", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -72,13 +66,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "null", @@ -86,19 +79,18 @@ }, "intend": 0, "interval": "{ Start : Start }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 36, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -106,13 +98,12 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 16, "extents": { "read_access": "null", @@ -120,13 +111,12 @@ }, "intend": 0, "interval": "{ Start : Start }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 0, "Stmts": [ { @@ -150,22 +140,8 @@ "interval": "{ Start : Start }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 16, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : Start }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 15, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -173,20 +149,32 @@ }, "intend": 2, "interval": "{ Start : Start }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 16, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : Start }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -194,13 +182,12 @@ }, "intend": 2, "interval": "{ Start+2 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 17, "extents": { "read_access": "null", @@ -208,19 +195,18 @@ }, "intend": 0, "interval": "{ Start+2 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 38, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -228,13 +214,12 @@ }, "intend": 2, "interval": "{ Start+2 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 17, "extents": { "read_access": "null", @@ -242,13 +227,12 @@ }, "intend": 0, "interval": "{ Start+2 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -272,22 +256,8 @@ "interval": "{ Start+2 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 17, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start+2 : End-1 }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 16, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -295,13 +265,25 @@ }, "intend": 2, "interval": "{ Start+2 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 17, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start+2 : End-1 }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test06_after_ref.json b/test/integration-test/PassStageReordering/Test06_after_ref.json index 522d9a3a..857ca8a3 100644 --- a/test/integration-test/PassStageReordering/Test06_after_ref.json +++ b/test/integration-test/PassStageReordering/Test06_after_ref.json @@ -1,108 +1,98 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 25, + "accessID": 23, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (-1, 1)]", + "write_access": "null" }, - "intend": 0, - "interval": "{ Start+3 : End-1 }", - "name": "field_a2", + "intend": 2, + "interval": "{ Start+1 : Start+1 }", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (-1, 1)]", + "write_access": "null" } - }, - "name": "field_a2" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 28, + "accessID": 24, "extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 0, - "interval": "{ Start+3 : End-1 }", - "name": "field_b2", + "intend": 1, + "interval": "{ Start+1 : End-1 }", "redundant extents": { - "read_access": "null", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b2" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 23, + "accessID": 25, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, - "interval": "{ Start+1 : Start+1 }", - "name": "field_a0", + "intend": 0, + "interval": "{ Start+3 : End-1 }", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a0" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 24, + "accessID": 27, "extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_a1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } }, - { + "field_b2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 27, + "accessID": 28, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, - "interval": "{ Start+1 : End-1 }", - "name": "field_b1", + "intend": 0, + "interval": "{ Start+3 : End-1 }", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } } - ], + }, "ID": "29", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (-1, 1)]", @@ -110,13 +100,12 @@ }, "intend": 2, "interval": "{ Start+1 : Start+1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, 1)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 24, "extents": { "read_access": "null", @@ -124,13 +113,12 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { "accessID": 27, "extents": { "read_access": "null", @@ -138,13 +126,12 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 56, "Loop": "parallel", "Stage0": { @@ -190,22 +177,21 @@ "interval": "{ Start+1 : Start+1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 27, + "Fields": { + "field_a0": { + "accessID": 23, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (-1, 1)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start+1 : Start+1 }", - "name": "field_b1", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (1, 1)]", + "write_access": "null" } }, - { + "field_a1": { "accessID": 24, "extents": { "read_access": "null", @@ -213,34 +199,32 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 23, + "field_b1": { + "accessID": 27, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_a0", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -248,27 +232,12 @@ }, "intend": 2, "interval": "{ Start+3 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { - "accessID": 27, - "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", - "write_access": "null" - }, - "intend": 2, - "interval": "{ Start+3 : End-1 }", - "name": "field_b1", - "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", - "write_access": "null" - } - }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -276,13 +245,25 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { + "accessID": 27, + "extents": { + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "null" + }, + "intend": 2, + "interval": "{ Start+3 : End-1 }", + "redundant extents": { + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "null" + } + }, + "field_b2": { "accessID": 28, "extents": { "read_access": "null", @@ -290,13 +271,12 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 57, "Loop": "parallel", "Stage0": { @@ -342,22 +322,21 @@ "interval": "{ Start+3 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 28, + "Fields": { + "field_a1": { + "accessID": 24, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (1, 1)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start+3 : End-1 }", - "name": "field_b2", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (1, 1)]", + "write_access": "null" } }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -365,13 +344,12 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -379,27 +357,25 @@ }, "intend": 2, "interval": "{ Start+3 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } }, - { - "accessID": 24, + "field_b2": { + "accessID": 28, "extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_a1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test06_before_ref.json b/test/integration-test/PassStageReordering/Test06_before_ref.json index b2dc5eb8..c3a0b68e 100644 --- a/test/integration-test/PassStageReordering/Test06_before_ref.json +++ b/test/integration-test/PassStageReordering/Test06_before_ref.json @@ -1,84 +1,76 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 25, + "accessID": 23, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (-1, 1)]", + "write_access": "null" }, - "intend": 0, - "interval": "{ Start+3 : End-1 }", - "name": "field_a2", + "intend": 2, + "interval": "{ Start+1 : Start+1 }", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (-1, 1)]", + "write_access": "null" } - }, - "name": "field_a2" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 27, + "accessID": 24, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start+1 : End-1 }", - "name": "field_b1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b1" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 24, + "accessID": 25, "extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, - "interval": "{ Start+1 : End-1 }", - "name": "field_a1", + "intend": 0, + "interval": "{ Start+3 : End-1 }", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } }, - { + "field_b1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 23, + "accessID": 27, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, 1)]", - "write_access": "null" + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, - "interval": "{ Start+1 : Start+1 }", - "name": "field_a0", + "intend": 1, + "interval": "{ Start+1 : End-1 }", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, 1)]", - "write_access": "null" + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a0" + } }, - { + "field_b2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -89,20 +81,18 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_b2" + } } - ], + }, "ID": "29", "MultiStage0": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (-1, 1)]", @@ -110,13 +100,12 @@ }, "intend": 2, "interval": "{ Start+1 : Start+1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, 1)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 24, "extents": { "read_access": "null", @@ -124,13 +113,12 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { "accessID": 27, "extents": { "read_access": "null", @@ -138,19 +126,18 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 52, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 23, "extents": { "read_access": "[(0, 0), (0, 0), (-1, 1)]", @@ -158,13 +145,12 @@ }, "intend": 2, "interval": "{ Start+1 : Start+1 }", - "name": "field_a0", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 24, "extents": { "read_access": "null", @@ -172,13 +158,12 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { "accessID": 27, "extents": { "read_access": "null", @@ -186,13 +171,12 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_b1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 0, "Stmts": [ { @@ -233,22 +217,21 @@ "interval": "{ Start+1 : Start+1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 27, + "Fields": { + "field_a0": { + "accessID": 23, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (-1, 1)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start+1 : Start+1 }", - "name": "field_b1", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (1, 1)]", + "write_access": "null" } }, - { + "field_a1": { "accessID": 24, "extents": { "read_access": "null", @@ -256,34 +239,32 @@ }, "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 23, + "field_b1": { + "accessID": 27, "extents": { - "read_access": "[(0, 0), (0, 0), (-1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 0, "interval": "{ Start+1 : Start+1 }", - "name": "field_a0", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -291,27 +272,12 @@ }, "intend": 2, "interval": "{ Start+3 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { - "accessID": 27, - "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", - "write_access": "null" - }, - "intend": 2, - "interval": "{ Start+3 : End-1 }", - "name": "field_b1", - "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", - "write_access": "null" - } - }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -319,13 +285,25 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { + "accessID": 27, + "extents": { + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "null" + }, + "intend": 2, + "interval": "{ Start+3 : End-1 }", + "redundant extents": { + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "null" + } + }, + "field_b2": { "accessID": 28, "extents": { "read_access": "null", @@ -333,19 +311,18 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 54, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 24, "extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", @@ -353,27 +330,12 @@ }, "intend": 2, "interval": "{ Start+3 : End-1 }", - "name": "field_a1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (1, 1)]", "write_access": "null" } }, - { - "accessID": 27, - "extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", - "write_access": "null" - }, - "intend": 2, - "interval": "{ Start+3 : End-1 }", - "name": "field_b1", - "redundant extents": { - "read_access": "[(0, 0), (0, 0), (-1, -1)]", - "write_access": "null" - } - }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -381,13 +343,25 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { + "accessID": 27, + "extents": { + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "null" + }, + "intend": 2, + "interval": "{ Start+3 : End-1 }", + "redundant extents": { + "read_access": "[(0, 0), (0, 0), (-1, -1)]", + "write_access": "null" + } + }, + "field_b2": { "accessID": 28, "extents": { "read_access": "null", @@ -395,13 +369,12 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_b2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -442,22 +415,21 @@ "interval": "{ Start+3 : End-1 }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 28, + "Fields": { + "field_a1": { + "accessID": 24, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (1, 1)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start+3 : End-1 }", - "name": "field_b2", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(0, 0), (0, 0), (1, 1)]", + "write_access": "null" } }, - { + "field_a2": { "accessID": 25, "extents": { "read_access": "null", @@ -465,13 +437,12 @@ }, "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { + "field_b1": { "accessID": 27, "extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", @@ -479,27 +450,25 @@ }, "intend": 2, "interval": "{ Start+3 : End-1 }", - "name": "field_b1", "redundant extents": { "read_access": "[(0, 0), (0, 0), (-1, -1)]", "write_access": "null" } }, - { - "accessID": 24, + "field_b2": { + "accessID": 28, "extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 0, "interval": "{ Start+3 : End-1 }", - "name": "field_a1", "redundant extents": { - "read_access": "[(0, 0), (0, 0), (1, 1)]", - "write_access": "null" + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test07_after_ref.json b/test/integration-test/PassStageReordering/Test07_after_ref.json index ba5f9ab3..796aeb76 100644 --- a/test/integration-test/PassStageReordering/Test07_after_ref.json +++ b/test/integration-test/PassStageReordering/Test07_after_ref.json @@ -1,46 +1,42 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 34, + "accessID": 33, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "write_access": "null" }, - "intend": 1, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "write_access": "null" } - }, - "name": "field_a1" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 33, + "accessID": 34, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 1, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a0" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -51,15 +47,13 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a2" + } }, - { + "field_a3": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -70,34 +64,30 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a3" + } }, - { + "field_a4": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 39, + "accessID": 37, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a6" + } }, - { + "field_a5": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -108,34 +98,30 @@ }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a5" + } }, - { + "field_a6": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 37, + "accessID": 39, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a4" + } }, - { + "field_a7": { "IsTemporary": false, "dim": "[1,1,1]", "field": { @@ -146,76 +132,70 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a7", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a7" + } } - ], + }, "ID": "41", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 36, + "Fields": { + "field_a0": { + "accessID": 33, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(1, 1), (0, 0), (0, 0)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(1, 1), (0, 0), (0, 0)]", + "write_access": "null" } }, - { - "accessID": 35, + "field_a1": { + "accessID": 34, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 33, + "field_a2": { + "accessID": 35, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 1, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 34, + "field_a3": { + "accessID": 36, "extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 83, "Loop": "parallel", "Stage0": { @@ -244,22 +224,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 34, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 33, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -267,13 +233,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 34, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -302,22 +280,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 35, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 34, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -325,13 +289,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 35, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage2": { @@ -360,22 +336,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 36, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a3", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a2": { "accessID": 35, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -383,76 +345,84 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a3": { + "accessID": 36, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage1": { "Caches": null, - "Fields": [ - { - "accessID": 39, + "Fields": { + "field_a3": { + "accessID": 36, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(1, 1), (0, 0), (0, 0)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(1, 1), (0, 0), (0, 0)]", + "write_access": "null" } }, - { - "accessID": 38, + "field_a4": { + "accessID": 37, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 36, + "field_a5": { + "accessID": 38, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 1, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 37, + "field_a6": { + "accessID": 39, "extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 84, "Loop": "parallel", "Stage0": { @@ -481,22 +451,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 37, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a4", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a3": { "accessID": 36, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -504,13 +460,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a4": { + "accessID": 37, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { @@ -539,22 +507,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 38, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a5", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a4": { "accessID": 37, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -562,13 +516,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a5": { + "accessID": 38, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage2": { @@ -597,22 +563,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 39, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a6", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a5": { "accessID": 38, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -620,20 +572,32 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a6": { + "accessID": 39, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }, "MultiStage2": { "Caches": null, - "Fields": [ - { + "Fields": { + "field_a6": { "accessID": 39, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -641,13 +605,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a7": { "accessID": 40, "extents": { "read_access": "null", @@ -655,13 +618,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a7", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 85, "Loop": "parallel", "Stage0": { @@ -690,22 +652,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 40, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a7", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a6": { "accessID": 39, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -713,13 +661,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a7": { + "accessID": 40, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } } diff --git a/test/integration-test/PassStageReordering/Test07_before_ref.json b/test/integration-test/PassStageReordering/Test07_before_ref.json index aa4fc318..7219ff24 100644 --- a/test/integration-test/PassStageReordering/Test07_before_ref.json +++ b/test/integration-test/PassStageReordering/Test07_before_ref.json @@ -1,283 +1,259 @@ { "IIR": { "Stencil0": { - "Fields": [ - { + "Fields": { + "field_a0": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 37, + "accessID": 33, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "write_access": "null" }, - "intend": 1, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "write_access": "null" } - }, - "name": "field_a4" + } }, - { + "field_a1": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 38, + "accessID": 34, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a5" + } }, - { + "field_a2": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 39, + "accessID": 35, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a6" + } }, - { + "field_a3": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 40, + "accessID": 36, "extents": { - "read_access": "null", + "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 0, + "intend": 1, "interval": "{ Start : End }", - "name": "field_a7", "redundant extents": { - "read_access": "null", + "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a7" + } }, - { + "field_a4": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 36, + "accessID": 37, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a3" + } }, - { + "field_a5": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 35, + "accessID": 38, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a2" + } }, - { + "field_a6": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 33, + "accessID": 39, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 1, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a0" + } }, - { + "field_a7": { "IsTemporary": false, "dim": "[1,1,1]", "field": { - "accessID": 34, + "accessID": 40, "extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } - }, - "name": "field_a1" + } } - ], + }, "ID": "41", "MultiStage0": { "Caches": null, - "Fields": [ - { - "accessID": 40, + "Fields": { + "field_a0": { + "accessID": 33, "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(1, 1), (0, 0), (0, 0)]", + "write_access": "null" }, - "intend": 0, + "intend": 2, "interval": "{ Start : End }", - "name": "field_a7", "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" + "read_access": "[(1, 1), (0, 0), (0, 0)]", + "write_access": "null" } }, - { - "accessID": 39, + "field_a1": { + "accessID": 34, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 38, + "field_a2": { + "accessID": 35, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 37, + "field_a3": { + "accessID": 36, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 36, + "field_a4": { + "accessID": 37, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 35, + "field_a5": { + "accessID": 38, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, "intend": 1, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 33, + "field_a6": { + "accessID": 39, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 2, + "intend": 1, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", - "write_access": "null" + "write_access": "[(0, 0), (0, 0), (0, 0)]" } }, - { - "accessID": 34, + "field_a7": { + "accessID": 40, "extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" }, - "intend": 1, + "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { - "read_access": "[(1, 1), (0, 0), (0, 0)]", + "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 74, "Loop": "parallel", "Stage0": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a0": { "accessID": 33, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -285,13 +261,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a1": { "accessID": 34, "extents": { "read_access": "null", @@ -299,13 +274,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 1, "Stmts": [ { @@ -329,22 +303,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 34, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a1", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a0": { "accessID": 33, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -352,19 +312,31 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a0", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a1": { + "accessID": 34, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage1": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a1": { "accessID": 34, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -372,13 +344,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a2": { "accessID": 35, "extents": { "read_access": "null", @@ -386,13 +357,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 2, "Stmts": [ { @@ -416,22 +386,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 35, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a2", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a1": { "accessID": 34, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -439,19 +395,31 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a1", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a2": { + "accessID": 35, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage2": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a2": { "accessID": 35, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -459,13 +427,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a3": { "accessID": 36, "extents": { "read_access": "null", @@ -473,13 +440,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 3, "Stmts": [ { @@ -503,22 +469,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 36, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a3", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a2": { "accessID": 35, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -526,19 +478,31 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a2", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a3": { + "accessID": 36, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage3": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a3": { "accessID": 36, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -546,13 +510,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a4": { "accessID": 37, "extents": { "read_access": "null", @@ -560,13 +523,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 4, "Stmts": [ { @@ -590,22 +552,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 37, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a4", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a3": { "accessID": 36, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -613,19 +561,31 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a3", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a4": { + "accessID": 37, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage4": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a4": { "accessID": 37, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -633,13 +593,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a5": { "accessID": 38, "extents": { "read_access": "null", @@ -647,13 +606,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 5, "Stmts": [ { @@ -677,22 +635,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 38, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a5", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a4": { "accessID": 37, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -700,19 +644,31 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a4", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a5": { + "accessID": 38, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage5": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a5": { "accessID": 38, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -720,13 +676,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a6": { "accessID": 39, "extents": { "read_access": "null", @@ -734,13 +689,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 6, "Stmts": [ { @@ -764,22 +718,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 39, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a6", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a5": { "accessID": 38, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -787,19 +727,31 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a5", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a6": { + "accessID": 39, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false }, "Stage6": { "DoMethod0": { - "Fields": [ - { + "Fields": { + "field_a6": { "accessID": 39, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -807,13 +759,12 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } }, - { + "field_a7": { "accessID": 40, "extents": { "read_access": "null", @@ -821,13 +772,12 @@ }, "intend": 0, "interval": "{ Start : End }", - "name": "field_a7", "redundant extents": { "read_access": "null", "write_access": "[(0, 0), (0, 0), (0, 0)]" } } - ], + }, "ID": 7, "Stmts": [ { @@ -851,22 +801,8 @@ "interval": "{ Start : End }" }, "Extents": "[(0, 0), (0, 0), (0, 0)]", - "Fields": [ - { - "accessID": 40, - "extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - }, - "intend": 0, - "interval": "{ Start : End }", - "name": "field_a7", - "redundant extents": { - "read_access": "null", - "write_access": "[(0, 0), (0, 0), (0, 0)]" - } - }, - { + "Fields": { + "field_a6": { "accessID": 39, "extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", @@ -874,13 +810,25 @@ }, "intend": 2, "interval": "{ Start : End }", - "name": "field_a6", "redundant extents": { "read_access": "[(1, 1), (0, 0), (0, 0)]", "write_access": "null" } + }, + "field_a7": { + "accessID": 40, + "extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + }, + "intend": 0, + "interval": "{ Start : End }", + "redundant extents": { + "read_access": "null", + "write_access": "[(0, 0), (0, 0), (0, 0)]" + } } - ], + }, "RequiresSync": false } }