diff --git a/test/types/records/sungeun/distInRecord.comm-gasnet.good b/test/types/records/sungeun/distInRecord.comm-gasnet.good deleted file mode 100644 index abe686ad39c1..000000000000 --- a/test/types/records/sungeun/distInRecord.comm-gasnet.good +++ /dev/null @@ -1,22 +0,0 @@ -(d = Block -------- -distributes: [1..2] -across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 -indexed via: [0..3] -resulting in: - [0] locale 0 owns chunk: [-2147483648..1] - [1] locale 1 owns chunk: [2..1] - [2] locale 2 owns chunk: [2..2] - [3] locale 3 owns chunk: [3..2147483647] -) -(d = Block -------- -distributes: [2..3] -across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 -indexed via: [0..3] -resulting in: - [0] locale 0 owns chunk: [-2147483648..2] - [1] locale 1 owns chunk: [3..2] - [2] locale 2 owns chunk: [3..3] - [3] locale 3 owns chunk: [4..2147483647] -) diff --git a/test/types/records/sungeun/distInRecord.comm-none.good b/test/types/records/sungeun/distInRecord.comm-none.good new file mode 100644 index 000000000000..0fea0b4e5e81 --- /dev/null +++ b/test/types/records/sungeun/distInRecord.comm-none.good @@ -0,0 +1,16 @@ +(d = blockDist +--------- +distributes: {1..2} +across locales: LOCALE0 +indexed via: {0..0} +resulting in: + [0] locale 0 owns chunk: {-9223372036854775808..9223372036854775807} +) +(d = blockDist +--------- +distributes: {2..3} +across locales: LOCALE0 +indexed via: {0..0} +resulting in: + [0] locale 0 owns chunk: {-9223372036854775808..9223372036854775807} +) diff --git a/test/types/records/sungeun/distInRecord.future b/test/types/records/sungeun/distInRecord.future deleted file mode 100644 index 9a6d1803245a..000000000000 --- a/test/types/records/sungeun/distInRecord.future +++ /dev/null @@ -1,7 +0,0 @@ -bug: Records (and probably classes) with fields that are distributions do not always work. - -I haven't fully pounded out what it takes to get distributions to -behave like arrays and domains (first class values), but it seems that -they will probably have runtime types. There is specialized code to -"process syntactic distribution" as it was first implemented, and -likely this and the module code will be need to be updated. diff --git a/test/types/records/sungeun/distInRecord.good b/test/types/records/sungeun/distInRecord.good index 9f9cfa829536..cbdbca00852a 100644 --- a/test/types/records/sungeun/distInRecord.good +++ b/test/types/records/sungeun/distInRecord.good @@ -1,16 +1,22 @@ -(d = Block -------- -distributes: [1..2] -across locales: LOCALE0 -indexed via: [0..0] +(d = blockDist +--------- +distributes: {1..2} +across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 +indexed via: {0..3} resulting in: - [0] locale 0 owns chunk: [-2147483648..2147483647] + [0] locale 0 owns chunk: {-9223372036854775808..1} + [1] locale 1 owns chunk: {2..1} + [2] locale 2 owns chunk: {2..2} + [3] locale 3 owns chunk: {3..9223372036854775807} ) -(d = Block -------- -distributes: [2..3] -across locales: LOCALE0 -indexed via: [0..0] +(d = blockDist +--------- +distributes: {2..3} +across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 +indexed via: {0..3} resulting in: - [0] locale 0 owns chunk: [-2147483648..2147483647] + [0] locale 0 owns chunk: {-9223372036854775808..2} + [1] locale 1 owns chunk: {3..2} + [2] locale 2 owns chunk: {3..3} + [3] locale 3 owns chunk: {4..9223372036854775807} ) diff --git a/test/types/records/sungeun/distInRecord.skipif b/test/types/records/sungeun/distInRecord.skipif deleted file mode 100644 index c387daaebc1a..000000000000 --- a/test/types/records/sungeun/distInRecord.skipif +++ /dev/null @@ -1,2 +0,0 @@ -CHPL_COMM == gasnet -COMPOPTS <= --no-local diff --git a/test/types/records/sungeun/distInRecordInClass.comm-gasnet.good b/test/types/records/sungeun/distInRecordInClass.comm-gasnet.good deleted file mode 100644 index f2d11885cea0..000000000000 --- a/test/types/records/sungeun/distInRecordInClass.comm-gasnet.good +++ /dev/null @@ -1,22 +0,0 @@ -{r = (d = Block -------- -distributes: [1..2] -across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 -indexed via: [0..3] -resulting in: - [0] locale 0 owns chunk: [-2147483648..1] - [1] locale 1 owns chunk: [2..1] - [2] locale 2 owns chunk: [2..2] - [3] locale 3 owns chunk: [3..2147483647] -)} -{r = (d = Block -------- -distributes: [2..3] -across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 -indexed via: [0..3] -resulting in: - [0] locale 0 owns chunk: [-2147483648..2] - [1] locale 1 owns chunk: [3..2] - [2] locale 2 owns chunk: [3..3] - [3] locale 3 owns chunk: [4..2147483647] -)} diff --git a/test/types/records/sungeun/distInRecordInClass.comm-none.good b/test/types/records/sungeun/distInRecordInClass.comm-none.good new file mode 100644 index 000000000000..599fe9ed7473 --- /dev/null +++ b/test/types/records/sungeun/distInRecordInClass.comm-none.good @@ -0,0 +1,16 @@ +{r = (d = blockDist +--------- +distributes: {1..2} +across locales: LOCALE0 +indexed via: {0..0} +resulting in: + [0] locale 0 owns chunk: {-9223372036854775808..9223372036854775807} +)} +{r = (d = blockDist +--------- +distributes: {2..3} +across locales: LOCALE0 +indexed via: {0..0} +resulting in: + [0] locale 0 owns chunk: {-9223372036854775808..9223372036854775807} +)} diff --git a/test/types/records/sungeun/distInRecordInClass.future b/test/types/records/sungeun/distInRecordInClass.future deleted file mode 100644 index 9a6d1803245a..000000000000 --- a/test/types/records/sungeun/distInRecordInClass.future +++ /dev/null @@ -1,7 +0,0 @@ -bug: Records (and probably classes) with fields that are distributions do not always work. - -I haven't fully pounded out what it takes to get distributions to -behave like arrays and domains (first class values), but it seems that -they will probably have runtime types. There is specialized code to -"process syntactic distribution" as it was first implemented, and -likely this and the module code will be need to be updated. diff --git a/test/types/records/sungeun/distInRecordInClass.good b/test/types/records/sungeun/distInRecordInClass.good index 4ef38679140f..416916ee6ea2 100644 --- a/test/types/records/sungeun/distInRecordInClass.good +++ b/test/types/records/sungeun/distInRecordInClass.good @@ -1,16 +1,22 @@ -{r = (d = Block -------- -distributes: [1..2] -across locales: LOCALE0 -indexed via: [0..0] +{r = (d = blockDist +--------- +distributes: {1..2} +across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 +indexed via: {0..3} resulting in: - [0] locale 0 owns chunk: [-2147483648..2147483647] + [0] locale 0 owns chunk: {-9223372036854775808..1} + [1] locale 1 owns chunk: {2..1} + [2] locale 2 owns chunk: {2..2} + [3] locale 3 owns chunk: {3..9223372036854775807} )} -{r = (d = Block -------- -distributes: [2..3] -across locales: LOCALE0 -indexed via: [0..0] +{r = (d = blockDist +--------- +distributes: {2..3} +across locales: LOCALE0 LOCALE1 LOCALE2 LOCALE3 +indexed via: {0..3} resulting in: - [0] locale 0 owns chunk: [-2147483648..2147483647] + [0] locale 0 owns chunk: {-9223372036854775808..2} + [1] locale 1 owns chunk: {3..2} + [2] locale 2 owns chunk: {3..3} + [3] locale 3 owns chunk: {4..9223372036854775807} )} diff --git a/test/types/records/sungeun/distInRecordInClass.skipif b/test/types/records/sungeun/distInRecordInClass.skipif deleted file mode 100644 index c387daaebc1a..000000000000 --- a/test/types/records/sungeun/distInRecordInClass.skipif +++ /dev/null @@ -1,2 +0,0 @@ -CHPL_COMM == gasnet -COMPOPTS <= --no-local