diff --git a/test/performance/ferguson/MYCOMPOPTS b/test/performance/ferguson/MYCOMPOPTS index 62eef6cf5f0b..595ffd4b4af8 100755 --- a/test/performance/ferguson/MYCOMPOPTS +++ b/test/performance/ferguson/MYCOMPOPTS @@ -28,20 +28,14 @@ def f(options, configname): # where the maximum is not passed. checkMaxAttained=' -scheckMaxAttained=true' -if not do_llvm: - # C backend, no cache remote - f('--no-cache-remote ' + checkMaxAttained, 'c') - # C backend, cache remote - if do_cache: - f('--cache-remote', 'c-cache') + +# Test combinations of wide-opt and remote cache + +f('--no-llvm-wide-opt --no-cache-remote ' + checkMaxAttained, 'no-wideopt-no-cache') +if do_cache: + f('--no-llvm-wide-opt --cache-remote', 'no-wideopt-cache') if do_llvm: - # LLVM backend, no cache remote - #f('--no-cache-remote', 'llvm') - # LLVM backend, cache remote - #f('--cache-remote', 'llvm-cache') - # LLVM backend, llvm wide opts, no cache remote - f('--llvm-wide-opt --no-cache-remote', 'llvm-wide-opt') - # LLVM backend, llvm wide opts, cache remote + f('--llvm-wide-opt --no-cache-remote', 'wideopt-no-cache') if do_cache: - f('--llvm-wide-opt --cache-remote', 'llvm-wide-opt-cache') + f('--llvm-wide-opt --cache-remote', 'wideopt-cache') diff --git a/test/performance/ferguson/array-assign-get.graph b/test/performance/ferguson/array-assign-get.graph index 63cf8d9c31dd..049d39dd20ef 100644 --- a/test/performance/ferguson/array-assign-get.graph +++ b/test/performance/ferguson/array-assign-get.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: array-assign-get-c.dat, array-assign-get-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: array-assign-get-no-wideopt-no-cache.dat, array-assign-get-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: array-assign-get diff --git a/test/performance/ferguson/remote-array-copy.graph b/test/performance/ferguson/remote-array-copy.graph index a09446239f6c..d6e3ed1f52f8 100644 --- a/test/performance/ferguson/remote-array-copy.graph +++ b/test/performance/ferguson/remote-array-copy.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, PUTs:, GETs:, PUTs: -files: remote-array-copy-c.dat, remote-array-copy-c.dat, remote-array-copy-c-cache.dat, remote-array-copy-c-cache.dat -graphkeys: c GETs, c PUTs, c-cache GETs, c-cache PUTs +files: remote-array-copy-no-wideopt-no-cache.dat, remote-array-copy-no-wideopt-no-cache.dat, remote-array-copy-no-wideopt-cache.dat, remote-array-copy-no-wideopt-cache.dat +graphkeys: no-cache GETs, no-cache PUTs, cache GETs, cache PUTs ylabel: Count graphtitle: remote-array-copy diff --git a/test/performance/ferguson/remote-array-read-access.graph b/test/performance/ferguson/remote-array-read-access.graph index 0c0e2d2ac0a6..13ed66a81404 100644 --- a/test/performance/ferguson/remote-array-read-access.graph +++ b/test/performance/ferguson/remote-array-read-access.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-array-read-access-c.dat, remote-array-read-access-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-array-read-access-no-wideopt-no-cache.dat, remote-array-read-access-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-array-read-access diff --git a/test/performance/ferguson/remote-array-read.graph b/test/performance/ferguson/remote-array-read.graph index c00fc04a0bfb..54c8f5c1b8b0 100644 --- a/test/performance/ferguson/remote-array-read.graph +++ b/test/performance/ferguson/remote-array-read.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-array-read-c.dat, remote-array-read-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-array-read-no-wideopt-no-cache.dat, remote-array-read-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-array-read diff --git a/test/performance/ferguson/remote-array-write-access.graph b/test/performance/ferguson/remote-array-write-access.graph index 31c63f04206f..67996165d250 100644 --- a/test/performance/ferguson/remote-array-write-access.graph +++ b/test/performance/ferguson/remote-array-write-access.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-array-write-access-c.dat, remote-array-write-access-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-array-write-access-no-wideopt-no-cache.dat, remote-array-write-access-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-array-write-access diff --git a/test/performance/ferguson/remote-array-write.graph b/test/performance/ferguson/remote-array-write.graph index d2112d3e9f12..2704409340d5 100644 --- a/test/performance/ferguson/remote-array-write.graph +++ b/test/performance/ferguson/remote-array-write.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-array-write-c.dat, remote-array-write-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-array-write-no-wideopt-no-cache.dat, remote-array-write-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-array-write diff --git a/test/performance/ferguson/remote-class-read.graph b/test/performance/ferguson/remote-class-read.graph index 949d5aeeabe8..b55b59dae6f7 100644 --- a/test/performance/ferguson/remote-class-read.graph +++ b/test/performance/ferguson/remote-class-read.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-class-read-c.dat, remote-class-read-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-class-read-no-wideopt-no-cache.dat, remote-class-read-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-class-read diff --git a/test/performance/ferguson/remote-class-write.graph b/test/performance/ferguson/remote-class-write.graph index 41c68b192991..9faf387d28cf 100644 --- a/test/performance/ferguson/remote-class-write.graph +++ b/test/performance/ferguson/remote-class-write.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, PUTs:, GETs:, PUTs: -files: remote-class-write-c.dat, remote-class-write-c.dat, remote-class-write-c-cache.dat, remote-class-write-c-cache.dat -graphkeys: c GETs, c PUTs, c-cache GETs, c-cache PUTs +files: remote-class-write-no-wideopt-no-cache.dat, remote-class-write-no-wideopt-no-cache.dat, remote-class-write-no-wideopt-cache.dat, remote-class-write-no-wideopt-cache.dat +graphkeys: no-cache GETs, no-cache PUTs, cache GETs, cache PUTs ylabel: Count graphtitle: remote-class-write diff --git a/test/performance/ferguson/remote-record-read-copy.graph b/test/performance/ferguson/remote-record-read-copy.graph index 0e18d111a645..ece76a530be5 100644 --- a/test/performance/ferguson/remote-record-read-copy.graph +++ b/test/performance/ferguson/remote-record-read-copy.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-record-read-copy-c.dat, remote-record-read-copy-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-record-read-copy-no-wideopt-no-cache.dat, remote-record-read-copy-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-record-read-copy diff --git a/test/performance/ferguson/remote-record-read-licm.graph b/test/performance/ferguson/remote-record-read-licm.graph index 60a20569ddb5..763d711d4dca 100644 --- a/test/performance/ferguson/remote-record-read-licm.graph +++ b/test/performance/ferguson/remote-record-read-licm.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-record-read-licm-c.dat, remote-record-read-licm-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-record-read-licm-no-wideopt-no-cache.dat, remote-record-read-licm-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-record-read-licm diff --git a/test/performance/ferguson/remote-record-read.graph b/test/performance/ferguson/remote-record-read.graph index 3fe726e432b8..dc196dff8a6c 100644 --- a/test/performance/ferguson/remote-record-read.graph +++ b/test/performance/ferguson/remote-record-read.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-record-read-c.dat, remote-record-read-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-record-read-no-wideopt-no-cache.dat, remote-record-read-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-record-read diff --git a/test/performance/ferguson/remote-record-write-copy.graph b/test/performance/ferguson/remote-record-write-copy.graph index eb99450fe293..15fe595e3558 100644 --- a/test/performance/ferguson/remote-record-write-copy.graph +++ b/test/performance/ferguson/remote-record-write-copy.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-record-write-copy-c.dat, remote-record-write-copy-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-record-write-copy-no-wideopt-no-cache.dat, remote-record-write-copy-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-record-write-copy diff --git a/test/performance/ferguson/remote-record-write.graph b/test/performance/ferguson/remote-record-write.graph index 7521ee2f6d0f..c7a6b62ffc66 100644 --- a/test/performance/ferguson/remote-record-write.graph +++ b/test/performance/ferguson/remote-record-write.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-record-write-c.dat, remote-record-write-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-record-write-no-wideopt-no-cache.dat, remote-record-write-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-record-write diff --git a/test/performance/ferguson/remote-tuple-read-copy.graph b/test/performance/ferguson/remote-tuple-read-copy.graph index b372e9a41c01..5c2f20a83f9b 100644 --- a/test/performance/ferguson/remote-tuple-read-copy.graph +++ b/test/performance/ferguson/remote-tuple-read-copy.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-tuple-read-copy-c.dat, remote-tuple-read-copy-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-tuple-read-copy-no-wideopt-no-cache.dat, remote-tuple-read-copy-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-tuple-read-copy diff --git a/test/performance/ferguson/remote-tuple-read-small-copy.graph b/test/performance/ferguson/remote-tuple-read-small-copy.graph index 2e8beee95d6e..3afe18fc223a 100644 --- a/test/performance/ferguson/remote-tuple-read-small-copy.graph +++ b/test/performance/ferguson/remote-tuple-read-small-copy.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-tuple-read-small-copy-c.dat, remote-tuple-read-small-copy-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-tuple-read-small-copy-no-wideopt-no-cache.dat, remote-tuple-read-small-copy-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-tuple-read-small-copy diff --git a/test/performance/ferguson/remote-tuple-read-small.graph b/test/performance/ferguson/remote-tuple-read-small.graph index 89f3f57b074a..40c4b7642dd6 100644 --- a/test/performance/ferguson/remote-tuple-read-small.graph +++ b/test/performance/ferguson/remote-tuple-read-small.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-tuple-read-small-c.dat, remote-tuple-read-small-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-tuple-read-small-no-wideopt-no-cache.dat, remote-tuple-read-small-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-tuple-read-small diff --git a/test/performance/ferguson/remote-tuple-read.graph b/test/performance/ferguson/remote-tuple-read.graph index 312407c7dfdb..5f9fb8b41077 100644 --- a/test/performance/ferguson/remote-tuple-read.graph +++ b/test/performance/ferguson/remote-tuple-read.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-tuple-read-c.dat, remote-tuple-read-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-tuple-read-no-wideopt-no-cache.dat, remote-tuple-read-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-tuple-read diff --git a/test/performance/ferguson/remote-tuple-write-copy.graph b/test/performance/ferguson/remote-tuple-write-copy.graph index fca2f144995b..2817410fd4c7 100644 --- a/test/performance/ferguson/remote-tuple-write-copy.graph +++ b/test/performance/ferguson/remote-tuple-write-copy.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-tuple-write-copy-c.dat, remote-tuple-write-copy-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-tuple-write-copy-no-wideopt-no-cache.dat, remote-tuple-write-copy-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-tuple-write-copy diff --git a/test/performance/ferguson/remote-tuple-write-small-copy.graph b/test/performance/ferguson/remote-tuple-write-small-copy.graph index 9ce737335ae1..83ac67fd5262 100644 --- a/test/performance/ferguson/remote-tuple-write-small-copy.graph +++ b/test/performance/ferguson/remote-tuple-write-small-copy.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-tuple-write-small-copy-c.dat, remote-tuple-write-small-copy-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-tuple-write-small-copy-no-wideopt-no-cache.dat, remote-tuple-write-small-copy-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-tuple-write-small-copy diff --git a/test/performance/ferguson/remote-tuple-write-small.graph b/test/performance/ferguson/remote-tuple-write-small.graph index 1d82a9af6002..5e6638a57b14 100644 --- a/test/performance/ferguson/remote-tuple-write-small.graph +++ b/test/performance/ferguson/remote-tuple-write-small.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-tuple-write-small-c.dat, remote-tuple-write-small-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-tuple-write-small-no-wideopt-no-cache.dat, remote-tuple-write-small-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-tuple-write-small diff --git a/test/performance/ferguson/remote-tuple-write.graph b/test/performance/ferguson/remote-tuple-write.graph index f7ee0c729af5..4a0451d3ebc2 100644 --- a/test/performance/ferguson/remote-tuple-write.graph +++ b/test/performance/ferguson/remote-tuple-write.graph @@ -1,5 +1,5 @@ perfkeys: PUTs:, PUTs: -files: remote-tuple-write-c.dat, remote-tuple-write-c-cache.dat -graphkeys: c PUTs, c-cache PUTs +files: remote-tuple-write-no-wideopt-no-cache.dat, remote-tuple-write-no-wideopt-cache.dat +graphkeys: no-cache PUTs, cache PUTs ylabel: Count graphtitle: remote-tuple-write diff --git a/test/performance/ferguson/remote-two-array-read.graph b/test/performance/ferguson/remote-two-array-read.graph index 19a9f12f6f1e..c6df70ac1d51 100644 --- a/test/performance/ferguson/remote-two-array-read.graph +++ b/test/performance/ferguson/remote-two-array-read.graph @@ -1,5 +1,5 @@ perfkeys: GETs:, GETs: -files: remote-two-array-read-c.dat, remote-two-array-read-c-cache.dat -graphkeys: c GETs, c-cache GETs +files: remote-two-array-read-no-wideopt-no-cache.dat, remote-two-array-read-no-wideopt-cache.dat +graphkeys: no-cache GETs, cache GETs ylabel: Count graphtitle: remote-two-array-read