Skip to content
This repository has been archived by the owner on Oct 18, 2019. It is now read-only.

Commit

Permalink
Fix json ordering (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cosunae @twicki
cosunae authored and twicki committed Mar 22, 2019
1 parent e90f293 commit fd124ae
Show file tree
Hide file tree
Showing 26 changed files with 2,099 additions and 2,636 deletions.
142 changes: 61 additions & 81 deletions test/integration-test/PassStageMerger/Test01_after_ref.json
View file
Original file line number Diff line number Diff line change
@@ -1,207 +1,191 @@
{
"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)]",
"write_access": "null"
},
"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 }",
"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",
"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)]"
}
}
],
},
"ID": 1,
"Stmts": [
{
Expand Down Expand Up @@ -242,64 +226,60 @@
"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",
"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)]"
}
},
{
"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
}
}
Expand Down
Loading

0 comments on commit fd124ae

Please sign in to comment.