configs: Tidy up configuration files and names

Signed-off-by: Mel Gorman <mgorman@techsingularity.net>

README

@@ -39,7 +39,7 @@ should be located, grep for MIRROR_LOCATION= in shellpacks/.
 A basic invocation of the suite is
 
 <pre>
-$ cp configs/config-global-dhp__pagealloc-performance config
+$ cp configs/config-pagealloc-performance config
 $ ./run-mmtests.sh --no-monitor 3.0-nomonitor
 $ ./run-mmtests.sh --run-monitor 3.0-runmonitor
 </pre>

bin/generate-fs-configs

@@ -5,154 +5,154 @@ export SCRIPTDIR=`echo $0 | sed -e "s/$SCRIPT//"`/..
 cd $SCRIPTDIR/configs || exit
 
 NOATIME_FSCONFIGS="
-config-global-dhp__db-pgbench-timed-ro-medium
-config-global-dhp__db-pgbench-timed-ro-small
-config-global-dhp__db-pgbench-timed-rw-medium
-config-global-dhp__db-pgbench-timed-rw-small
-config-global-dhp__db-pgbench-timed-ro-medium-tuned
-config-global-dhp__db-pgbench-timed-ro-small-tuned
-config-global-dhp__db-pgbench-timed-rw-medium-tuned
-config-global-dhp__db-pgbench-timed-rw-small-tuned
-config-global-dhp__db-pgbench-timed-ro-small-full-tuned
-config-global-dhp__db-pgbench-timed-ro-small-full-hugetlbfs-tuned
-config-global-dhp__db-sysbench-mariadb-oltp-ro-medium
-config-global-dhp__db-sysbench-mariadb-oltp-ro-small
-config-global-dhp__db-sysbench-mariadb-oltp-rw-medium
-config-global-dhp__db-sysbench-mariadb-oltp-rw-small
-config-global-dhp__db-sysbench-postgres-oltp-ro-medium
-config-global-dhp__db-sysbench-postgres-oltp-ro-small
-config-global-dhp__db-sysbench-postgres-oltp-rw-medium
-config-global-dhp__db-sysbench-postgres-oltp-rw-small
-config-global-dhp__pgioperf
-config-global-dhp__workload_usemem
+config-db-pgbench-timed-ro-medium
+config-db-pgbench-timed-ro-small
+config-db-pgbench-timed-rw-medium
+config-db-pgbench-timed-rw-small
+config-db-pgbench-timed-ro-medium-tuned
+config-db-pgbench-timed-ro-small-tuned
+config-db-pgbench-timed-rw-medium-tuned
+config-db-pgbench-timed-rw-small-tuned
+config-db-pgbench-timed-ro-small-full-tuned
+config-db-pgbench-timed-ro-small-full-hugetlbfs-tuned
+config-db-sysbench-mariadb-oltp-ro-medium
+config-db-sysbench-mariadb-oltp-ro-small
+config-db-sysbench-mariadb-oltp-rw-medium
+config-db-sysbench-mariadb-oltp-rw-small
+config-db-sysbench-postgres-oltp-ro-medium
+config-db-sysbench-postgres-oltp-ro-small
+config-db-sysbench-postgres-oltp-rw-medium
+config-db-sysbench-postgres-oltp-rw-small
+config-pgioperf
+config-workload_usemem
 "
 
 RAMCONFIGS="
-config-global-dhp__io-iozone-ram
-config-global-dhp__io-iozone-ram-dio
+config-io-iozone-ram
+config-io-iozone-ram-dio
 "
 
 DEADLINE_FSCONFIGS="
-config-global-dhp__io-fio-randread-async-randwrite
-config-global-dhp__io-fio-randread-async-seqwrite
-config-global-dhp__io-fio-randread-sync-heavywrite
-config-global-dhp__io-fio-randread-sync-randwrite
-config-global-dhp__io-bonnie-file-async
-config-global-dhp__io-bonnie-dir-async
-config-global-dhp__io-bonnie-file-fsync
-config-global-dhp__io-bonnie-dir-fsync
+config-io-fio-randread-async-randwrite
+config-io-fio-randread-async-seqwrite
+config-io-fio-randread-sync-heavywrite
+config-io-fio-randread-sync-randwrite
+config-io-bonnie-file-async
+config-io-bonnie-dir-async
+config-io-bonnie-file-fsync
+config-io-bonnie-dir-fsync
 "
 
 FSCONFIGS="
-config-global-dhp__io-metadata
-config-global-dhp__io-dbench4-async
-config-global-dhp__io-dbench4-fsync
-config-global-dhp__io-fio-randread-direct-multi
-config-global-dhp__io-fsmark-xfsrepair
-config-global-dhp__pagereclaim-performance
-config-global-dhp__pagereclaim-shrinker
-config-global-dhp__workload-fsmark-50m-inode
-config-global-dhp__workload-fsmark-50m-zerofile-inode
-config-global-dhp__io-xfsrepair
-config-global-dhp__io-compress
-config-global-dhp__nas-c-class-mpi-full
-config-global-dhp__nas-c-class-mpi-half
-config-global-dhp__nas-c-class-mpi-third
-config-global-dhp__nas-c-class-mpi-quarter
-config-global-dhp__nas-d-class-mpi-bind-full
-config-global-dhp__nas-d-class-mpi-bind-half
-config-global-dhp__nas-d-class-mpi-bind-third
-config-global-dhp__nas-d-class-mpi-bind-quarter
-config-global-dhp__nas-d-class-mpi-full
-config-global-dhp__nas-d-class-mpi-half
-config-global-dhp__nas-d-class-mpi-third
-config-global-dhp__nas-d-class-mpi-quarter
-config-global-dhp__workload_mailserver
-config-global-dhp__workload_kerndevel
-config-global-dhp__workload_dedup
-config-global-dhp__workload_shellscripts
-config-global-dhp__workload_sparsetruncate-tiny
-config-global-dhp__workload_sparsetruncate-small
-config-global-dhp__workload_sparsetruncate-large
-config-global-dhp__workload_thpfioscale
-config-global-dhp__workload_thpfioscale-defrag
-config-global-dhp__workload_thpfioscale-madvhugepage
-config-global-dhp__reaim-io-alltests
-config-global-dhp__reaim-io-compute
-config-global-dhp__reaim-io-disk
-config-global-dhp__reaim-io-disk-large
-config-global-dhp__reaim-io-new_dbase
-config-global-dhp__reaim-io-new_fserver
-config-global-dhp__reaim-io-new_fserver-large
-config-global-dhp__reaim-io-shared
-config-global-dhp__reaim-highsys
-config-global-dhp__reaim-stress
-config-global-dhp__stress-highalloc-performance
-config-global-dhp__io-bonnie-file-async
-config-global-dhp__io-bonnie-dir-async
-config-global-dhp__io-bonnie-file-fsync
-config-global-dhp__io-bonnie-dir-fsync
-config-global-dhp__io-bonnie-file-async-fixed
-config-global-dhp__io-bonnie-dir-async-fixed
-config-global-dhp__io-bonnie-file-fsync-fixed
-config-global-dhp__io-bonnie-dir-fsync-fixed
-config-global-dhp__io-iozone
-config-global-dhp__io-iozone-small
-config-global-dhp__io-iozone-dio
-config-global-dhp__io-seeker-file-read
-config-global-dhp__io-seeker-file-write
-config-global-dhp__io-filebench-varmail-small
-config-global-dhp__io-filebench-varmail-medium
-config-global-dhp__io-filebench-varmail-large
-config-global-dhp__io-filebench-oltp-small
-config-global-dhp__io-filebench-oltp-large
-config-global-dhp__io-filebench-oltp-directio-small
-config-global-dhp__io-filebench-oltp-directio-large
-config-global-dhp__io-filebench-webserver-small
-config-global-dhp__io-filebench-webproxy-small
-config-global-dhp__io-filebench-webproxy-medium
-config-global-dhp__io-filebench-webproxy-large
-config-global-dhp__workload_thpscale
-config-global-dhp__workload_thpscale-madvhugepage
-config-global-dhp__workload_will-it-scale-io
-config-global-dhp__io-iozone-doublemem-async
-config-global-dhp__io-iozone-doublemem-fsync
-config-global-dhp__db-sqlite-insert-small
-config-global-dhp__db-sqlite-insert-medium
-config-global-dhp__io-paralleldd-read-small
-config-global-dhp__io-paralleldd-read-large
-config-global-dhp__io-paralleldd-read-small-multi
-config-global-dhp__io-paralleldd-read-large-multi
-config-global-dhp__io-fio-randread-async-randwrite
-config-global-dhp__io-fio-randread-async-seqwrite
-config-global-dhp__io-fio-randread-sync-heavywrite
-config-global-dhp__io-fio-randread-sync-randwrite
-config-global-dhp__io-fio-seqread-doublemem-4k-4t
-config-global-dhp__io-fio-seqread-doublemem-32k-4t
-config-global-dhp__io-fio-sync-maxrandwrite
-config-global-dhp__io-fio-sync-maxrandwrite-ftrace
-config-global-dhp__io-fio-sync-maxrandwrite-long-ftrace
-config-global-dhp__io-blogbench
-config-global-dhp__workload_libmicro-file
-config-global-dhp__io-xfsio
-config-global-dhp__io-xfsio-profile-normal
-config-global-dhp__workload_unixbench-io-fsbuffer
-config-global-dhp__workload_unixbench-io-fsdisk
-config-global-dhp__workload_unixbench-io-fstime
-config-global-dhp__workload_simoop-short
-config-global-dhp__speccpu2017-speed
-config-global-dhp__speccpu2017-speed-parallel-quarter
-config-global-dhp__speccpu2017-speed-parallel-half
-config-global-dhp__speccpu2017-speed-parallel-full
-config-global-dhp__speccpu2017-rate-parallel-quarter
-config-global-dhp__speccpu2017-rate-parallel-half
-config-global-dhp__speccpu2017-rate-parallel-full
-config-global-dhp__S-startup
-config-global-dhp__parsec-pthreads-half
-config-global-dhp__parsec-pthreads-full
-config-global-dhp__functional-ltp-cve
-config-global-dhp__functional-ltp-lite
-config-global-dhp__functional-xfstests-auto
+config-io-metadata
+config-io-dbench4-async
+config-io-dbench4-fsync
+config-io-fio-randread-direct-multi
+config-io-fsmark-xfsrepair
+config-pagereclaim-performance
+config-pagereclaim-shrinker
+config-workload-fsmark-50m-inode
+config-workload-fsmark-50m-zerofile-inode
+config-io-xfsrepair
+config-io-compress
+config-nas-c-class-mpi-full
+config-nas-c-class-mpi-half
+config-nas-c-class-mpi-third
+config-nas-c-class-mpi-quarter
+config-nas-d-class-mpi-bind-full
+config-nas-d-class-mpi-bind-half
+config-nas-d-class-mpi-bind-third
+config-nas-d-class-mpi-bind-quarter
+config-nas-d-class-mpi-full
+config-nas-d-class-mpi-half
+config-nas-d-class-mpi-third
+config-nas-d-class-mpi-quarter
+config-workload_mailserver
+config-workload_kerndevel
+config-workload_dedup
+config-workload_shellscripts
+config-workload_sparsetruncate-tiny
+config-workload_sparsetruncate-small
+config-workload_sparsetruncate-large
+config-workload_thpfioscale
+config-workload_thpfioscale-defrag
+config-workload_thpfioscale-madvhugepage
+config-reaim-io-alltests
+config-reaim-io-compute
+config-reaim-io-disk
+config-reaim-io-disk-large
+config-reaim-io-new_dbase
+config-reaim-io-new_fserver
+config-reaim-io-new_fserver-large
+config-reaim-io-shared
+config-reaim-highsys
+config-reaim-stress
+config-stress-highalloc-performance
+config-io-bonnie-file-async
+config-io-bonnie-dir-async
+config-io-bonnie-file-fsync
+config-io-bonnie-dir-fsync
+config-io-bonnie-file-async-fixed
+config-io-bonnie-dir-async-fixed
+config-io-bonnie-file-fsync-fixed
+config-io-bonnie-dir-fsync-fixed
+config-io-iozone
+config-io-iozone-small
+config-io-iozone-dio
+config-io-seeker-file-read
+config-io-seeker-file-write
+config-io-filebench-varmail-small
+config-io-filebench-varmail-medium
+config-io-filebench-varmail-large
+config-io-filebench-oltp-small
+config-io-filebench-oltp-large
+config-io-filebench-oltp-directio-small
+config-io-filebench-oltp-directio-large
+config-io-filebench-webserver-small
+config-io-filebench-webproxy-small
+config-io-filebench-webproxy-medium
+config-io-filebench-webproxy-large
+config-workload_thpscale
+config-workload_thpscale-madvhugepage
+config-workload_will-it-scale-io
+config-io-iozone-doublemem-async
+config-io-iozone-doublemem-fsync
+config-db-sqlite-insert-small
+config-db-sqlite-insert-medium
+config-io-paralleldd-read-small
+config-io-paralleldd-read-large
+config-io-paralleldd-read-small-multi
+config-io-paralleldd-read-large-multi
+config-io-fio-randread-async-randwrite
+config-io-fio-randread-async-seqwrite
+config-io-fio-randread-sync-heavywrite
+config-io-fio-randread-sync-randwrite
+config-io-fio-seqread-doublemem-4k-4t
+config-io-fio-seqread-doublemem-32k-4t
+config-io-fio-sync-maxrandwrite
+config-io-fio-sync-maxrandwrite-ftrace
+config-io-fio-sync-maxrandwrite-long-ftrace
+config-io-blogbench
+config-workload_libmicro-file
+config-io-xfsio
+config-io-xfsio-profile-normal
+config-workload_unixbench-io-fsbuffer
+config-workload_unixbench-io-fsdisk
+config-workload_unixbench-io-fstime
+config-workload_simoop-short
+config-speccpu2017-speed
+config-speccpu2017-speed-parallel-quarter
+config-speccpu2017-speed-parallel-half
+config-speccpu2017-speed-parallel-full
+config-speccpu2017-rate-parallel-quarter
+config-speccpu2017-rate-parallel-half
+config-speccpu2017-rate-parallel-full
+config-S-startup
+config-parsec-pthreads-half
+config-parsec-pthreads-full
+config-functional-ltp-cve
+config-functional-ltp-lite
+config-functional-xfstests-auto
 "
 
 rm -f *-ext3 *-ext4 *-btrfs *-btrfs-nocow *-xfs *-raid0 *-raid1 *-raid5
@@ -367,8 +367,8 @@ for CONFIG in $LIMITMEM_CONFIGS; do
 done
 
 TMPFS_CONFIGS="
-config-global-dhp__io-paralleldd-read-small
-config-global-dhp__pagereclaim-performance
+config-io-paralleldd-read-small
+config-pagereclaim-performance
 "
 
 for CONFIG in $TMPFS_CONFIGS; do

configs/config-global-dhp__S-startup → configs/config-S-startup

@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="S-startup"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0

configs/config-global-dhp__adrestia-periodic-unbound → configs/config-adrestia-periodic-unbound

@@ -15,9 +15,6 @@
 # MM Test Parameters
 export MMTESTS="adrestia-wakeup-periodic"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0

configs/config-global-dhp__adrestia-single-unbound → configs/config-adrestia-single-unbound

@@ -1,10 +1,6 @@
-
 # MM Test Parameters
 export MMTESTS="adrestia-wakeup-single"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0

configs/config-global-dhp__db-pgbench-timed-ro-medium → configs/config-db-pgbench-timed-ro-medium

@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0

configs/config-global-dhp__db-pgbench-timed-ro-medium-tuned → configs/config-db-pgbench-timed-ro-medium-tuned

@@ -9,9 +9,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0

configs/config-global-dhp__db-pgbench-timed-ro-small → configs/config-db-pgbench-timed-ro-small

@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0

configs/config-global-dhp__db-pgbench-timed-ro-small-full-hugetlbfs-tuned → configs/config-db-pgbench-timed-ro-small-full-hugetlbfs-tuned

@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0

configs/config-global-dhp__db-pgbench-timed-ro-small-full-tuned → configs/config-db-pgbench-timed-ro-small-full-tuned

@@ -8,9 +8,6 @@
 # MM Test Parameters
 export MMTESTS="pgbench"
 
-
-# Machine configuration
-
 # Test disk to setup (optional)
 #export TESTDISK_RAID_DEVICES=
 #export TESTDISK_RAID_MD_DEVICE=/dev/md0