From dd606a16e840880e7617b140f6083af8ea83b6b7 Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Tue, 20 Oct 2020 17:10:14 -0400 Subject: Whitespace fixes for TACLeBench and copyright update in extra.h Also move run_all_dis.sh up a directory in preperation for further changes. --- all_pairs/source/adpcm_dec/adpcm_dec.c | 8 +-- all_pairs/source/adpcm_enc/adpcm_enc.c | 12 ++-- all_pairs/source/ammunition/ammunition.c | 12 ++-- all_pairs/source/anagram/anagram.c | 12 ++-- all_pairs/source/audiobeam/audiobeam.c | 14 ++--- all_pairs/source/cjpeg_transupp/cjpeg_transupp.c | 12 ++-- all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c | 14 ++--- all_pairs/source/dijkstra/dijkstra.c | 12 ++-- all_pairs/source/fmref/fmref.c | 12 ++-- all_pairs/source/g723_enc/g723_enc.c | 12 ++-- all_pairs/source/gsm_dec/gsm_dec.c | 12 ++-- all_pairs/source/gsm_enc/gsm_enc.c | 12 ++-- all_pairs/source/h264_dec/h264_dec.c | 12 ++-- all_pairs/source/huff_dec/huff_dec.c | 12 ++-- all_pairs/source/huff_enc/huff_enc.c | 12 ++-- all_pairs/source/mpeg2/mpeg2.c | 12 ++-- all_pairs/source/ndes/ndes.c | 12 ++-- all_pairs/source/petrinet/petrinet.c | 10 ++-- all_pairs/source/rijndael_dec/rijndael_dec.c | 12 ++-- all_pairs/source/statemate/statemate.c | 12 ++-- all_pairs/source/susan/susan.c | 12 ++-- baseline/source/adpcm_dec/adpcm_dec.c | 8 +-- baseline/source/adpcm_enc/adpcm_enc.c | 12 ++-- baseline/source/ammunition/ammunition.c | 12 ++-- baseline/source/anagram/anagram.c | 12 ++-- baseline/source/audiobeam/audiobeam.c | 14 ++--- baseline/source/cjpeg_transupp/cjpeg_transupp.c | 12 ++-- baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c | 14 ++--- baseline/source/dijkstra/dijkstra.c | 12 ++-- baseline/source/fmref/fmref.c | 12 ++-- baseline/source/g723_enc/g723_enc.c | 12 ++-- baseline/source/gsm_dec/gsm_dec.c | 12 ++-- baseline/source/gsm_enc/gsm_enc.c | 12 ++-- baseline/source/h264_dec/h264_dec.c | 12 ++-- baseline/source/huff_dec/huff_dec.c | 12 ++-- baseline/source/huff_enc/huff_enc.c | 12 ++-- baseline/source/mpeg2/mpeg2.c | 12 ++-- baseline/source/ndes/ndes.c | 12 ++-- baseline/source/petrinet/petrinet.c | 10 ++-- baseline/source/rijndael_dec/rijndael_dec.c | 12 ++-- baseline/source/statemate/statemate.c | 12 ++-- baseline/source/susan/susan.c | 12 ++-- dis/run_all_dis.sh | 70 ------------------------ extra.h | 2 +- run_all_dis.sh | 70 ++++++++++++++++++++++++ 45 files changed, 319 insertions(+), 323 deletions(-) delete mode 100755 dis/run_all_dis.sh create mode 100755 run_all_dis.sh diff --git a/all_pairs/source/adpcm_dec/adpcm_dec.c b/all_pairs/source/adpcm_dec/adpcm_dec.c index 7994390..0627c9c 100644 --- a/all_pairs/source/adpcm_dec/adpcm_dec.c +++ b/all_pairs/source/adpcm_dec/adpcm_dec.c @@ -709,9 +709,9 @@ int main(int argc, char **argv) { SET_UP for_each_job { - adpcm_dec_init(); - adpcm_dec_main(); -} -WRITE_TO_FILE + adpcm_dec_init(); + adpcm_dec_main(); + } + WRITE_TO_FILE return ( adpcm_dec_return() ); } diff --git a/all_pairs/source/adpcm_enc/adpcm_enc.c b/all_pairs/source/adpcm_enc/adpcm_enc.c index 661bcc6..118382f 100644 --- a/all_pairs/source/adpcm_enc/adpcm_enc.c +++ b/all_pairs/source/adpcm_enc/adpcm_enc.c @@ -746,11 +746,11 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void) int main(int argc, char **argv) { - SET_UP - for_each_job { - adpcm_enc_init(); - adpcm_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + adpcm_enc_init(); + adpcm_enc_main(); + } + WRITE_TO_FILE return adpcm_enc_return(); } diff --git a/all_pairs/source/ammunition/ammunition.c b/all_pairs/source/ammunition/ammunition.c index 90e89d6..4ae488b 100644 --- a/all_pairs/source/ammunition/ammunition.c +++ b/all_pairs/source/ammunition/ammunition.c @@ -1173,11 +1173,11 @@ void _Pragma( "entrypoint" ) ammunition_main( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - ammunition_init(); - ammunition_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + ammunition_init(); + ammunition_main(); + } + WRITE_TO_FILE return ( ammunition_return() ); } diff --git a/all_pairs/source/anagram/anagram.c b/all_pairs/source/anagram/anagram.c index 1061470..fc8b6a8 100644 --- a/all_pairs/source/anagram/anagram.c +++ b/all_pairs/source/anagram/anagram.c @@ -658,11 +658,11 @@ void _Pragma( "entrypoint" ) anagram_main( void ) int main(int argc, char **argv) { - SET_UP - for_each_job { - anagram_init(); - anagram_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + anagram_init(); + anagram_main(); + } + WRITE_TO_FILE return anagram_return(); } diff --git a/all_pairs/source/audiobeam/audiobeam.c b/all_pairs/source/audiobeam/audiobeam.c index 7d89f06..5f23daf 100644 --- a/all_pairs/source/audiobeam/audiobeam.c +++ b/all_pairs/source/audiobeam/audiobeam.c @@ -579,13 +579,13 @@ void _Pragma( "entrypoint" ) audiobeam_main( void ) int main( int argc, char **argv ) -{ - SET_UP - for_each_job { - audiobeam_init(); - audiobeam_main(); - } - WRITE_TO_FILE +{ + SET_UP + for_each_job { + audiobeam_init(); + audiobeam_main(); + } + WRITE_TO_FILE return ( audiobeam_return() ); } diff --git a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c index 4a95fe1..112fba1 100644 --- a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c +++ b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c @@ -706,11 +706,11 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void ) int main(int argc, char **argv) { - SET_UP - for_each_job { - cjpeg_transupp_init(); - cjpeg_transupp_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + cjpeg_transupp_init(); + cjpeg_transupp_main(); + } + WRITE_TO_FILE return ( cjpeg_transupp_return() - 660 != 0 ); } diff --git a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c index 57daca4..a7aa477 100644 --- a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c +++ b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c @@ -210,13 +210,13 @@ int cjpeg_wrbmp_return() int main(int argc, char **argv) { - SET_UP - for_each_job { - cjpeg_wrbmp_init(); - cjpeg_wrbmp_main(); - } - WRITE_TO_FILE - return ( cjpeg_wrbmp_return() ); + SET_UP + for_each_job { + cjpeg_wrbmp_init(); + cjpeg_wrbmp_main(); + } + WRITE_TO_FILE + return ( cjpeg_wrbmp_return() ); } #endif /* BMP_SUPPORTED */ diff --git a/all_pairs/source/dijkstra/dijkstra.c b/all_pairs/source/dijkstra/dijkstra.c index e9b115e..6602918 100644 --- a/all_pairs/source/dijkstra/dijkstra.c +++ b/all_pairs/source/dijkstra/dijkstra.c @@ -192,11 +192,11 @@ void _Pragma( "entrypoint" ) dijkstra_main( void ) int main(int argc, char** argv ) { - SET_UP - for_each_job { - dijkstra_init(); - dijkstra_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + dijkstra_init(); + dijkstra_main(); + } + WRITE_TO_FILE return ( dijkstra_return() ); } diff --git a/all_pairs/source/fmref/fmref.c b/all_pairs/source/fmref/fmref.c index ccd5954..b086f5a 100644 --- a/all_pairs/source/fmref/fmref.c +++ b/all_pairs/source/fmref/fmref.c @@ -77,12 +77,12 @@ int fmref_return(void) int main(int argc, char **argv){ - SET_UP - for_each_job { - fmref_init(); - fmref_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + fmref_init(); + fmref_main(); + } + WRITE_TO_FILE return fmref_return(); } diff --git a/all_pairs/source/g723_enc/g723_enc.c b/all_pairs/source/g723_enc/g723_enc.c index 646adcd..bf2df51 100644 --- a/all_pairs/source/g723_enc/g723_enc.c +++ b/all_pairs/source/g723_enc/g723_enc.c @@ -875,12 +875,12 @@ void _Pragma( "entrypoint" ) g723_enc_main() int main( int argc, char **argv ) { - SET_UP - for_each_job { - g723_enc_init(); - g723_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + g723_enc_init(); + g723_enc_main(); + } + WRITE_TO_FILE return ( g723_enc_return() ); } diff --git a/all_pairs/source/gsm_dec/gsm_dec.c b/all_pairs/source/gsm_dec/gsm_dec.c index be6513c..abde144 100644 --- a/all_pairs/source/gsm_dec/gsm_dec.c +++ b/all_pairs/source/gsm_dec/gsm_dec.c @@ -752,11 +752,11 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void ) int main( int argc, char **argv) { - SET_UP - for_each_job { - gsm_dec_init(); - gsm_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + gsm_dec_init(); + gsm_dec_main(); + } + WRITE_TO_FILE return ( gsm_dec_return() ); } diff --git a/all_pairs/source/gsm_enc/gsm_enc.c b/all_pairs/source/gsm_enc/gsm_enc.c index 86f062b..75e2e7f 100644 --- a/all_pairs/source/gsm_enc/gsm_enc.c +++ b/all_pairs/source/gsm_enc/gsm_enc.c @@ -2060,11 +2060,11 @@ void gsm_enc_main( void ) int main( int argc, char** argv ) { - SET_UP - for_each_job { - gsm_enc_init(); - gsm_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + gsm_enc_init(); + gsm_enc_main(); + } + WRITE_TO_FILE return ( gsm_enc_return() ); } diff --git a/all_pairs/source/h264_dec/h264_dec.c b/all_pairs/source/h264_dec/h264_dec.c index 4b1d939..1abd883 100644 --- a/all_pairs/source/h264_dec/h264_dec.c +++ b/all_pairs/source/h264_dec/h264_dec.c @@ -597,12 +597,12 @@ void _Pragma( "entrypoint" ) h264_dec_main( void ) int main( int argc, char** argv ) { - SET_UP - for_each_job { - h264_dec_init(); - h264_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + h264_dec_init(); + h264_dec_main(); + } + WRITE_TO_FILE return ( h264_dec_return() ); } diff --git a/all_pairs/source/huff_dec/huff_dec.c b/all_pairs/source/huff_dec/huff_dec.c index e0ebc19..8ebf2f7 100644 --- a/all_pairs/source/huff_dec/huff_dec.c +++ b/all_pairs/source/huff_dec/huff_dec.c @@ -381,11 +381,11 @@ void _Pragma( "entrypoint" ) huff_dec_main( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - huff_dec_init(); - huff_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + huff_dec_init(); + huff_dec_main(); + } + WRITE_TO_FILE return ( huff_dec_return() ); } diff --git a/all_pairs/source/huff_enc/huff_enc.c b/all_pairs/source/huff_enc/huff_enc.c index 02522aa..f2db552 100644 --- a/all_pairs/source/huff_enc/huff_enc.c +++ b/all_pairs/source/huff_enc/huff_enc.c @@ -577,11 +577,11 @@ void _Pragma( "entrypoint" ) huff_enc_main() int main( int argc, char **argv ) { - SET_UP - for_each_job { - huff_enc_init(); - huff_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + huff_enc_init(); + huff_enc_main(); + } + WRITE_TO_FILE return ( huff_enc_return() ); } diff --git a/all_pairs/source/mpeg2/mpeg2.c b/all_pairs/source/mpeg2/mpeg2.c index cc4c215..cceeb30 100644 --- a/all_pairs/source/mpeg2/mpeg2.c +++ b/all_pairs/source/mpeg2/mpeg2.c @@ -13205,12 +13205,12 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - mpeg2_init(); - mpeg2_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + mpeg2_init(); + mpeg2_main(); + } + WRITE_TO_FILE return( mpeg2_return() - (-116) != 0 ); } diff --git a/all_pairs/source/ndes/ndes.c b/all_pairs/source/ndes/ndes.c index b919018..5d00d94 100644 --- a/all_pairs/source/ndes/ndes.c +++ b/all_pairs/source/ndes/ndes.c @@ -365,12 +365,12 @@ void _Pragma( "entrypoint" ) ndes_main() int main( int argc, char **argv ) { - SET_UP - for_each_job { - ndes_init(); - ndes_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + ndes_init(); + ndes_main(); + } + WRITE_TO_FILE return ( ndes_return() ); } diff --git a/all_pairs/source/petrinet/petrinet.c b/all_pairs/source/petrinet/petrinet.c index 79da104..a54a999 100644 --- a/all_pairs/source/petrinet/petrinet.c +++ b/all_pairs/source/petrinet/petrinet.c @@ -976,12 +976,10 @@ int petrinet_return( void ) int main( int argc, char **argv ) { SET_UP - - for_each_job { - - petrinet_main(); - } - WRITE_TO_FILE + for_each_job { + petrinet_main(); + } + WRITE_TO_FILE return ( petrinet_return() ); } diff --git a/all_pairs/source/rijndael_dec/rijndael_dec.c b/all_pairs/source/rijndael_dec/rijndael_dec.c index ccd6a65..c8f606b 100644 --- a/all_pairs/source/rijndael_dec/rijndael_dec.c +++ b/all_pairs/source/rijndael_dec/rijndael_dec.c @@ -182,12 +182,12 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void ) int main(int argc, char** argv) { - SET_UP - for_each_job { - rijndael_dec_init(); - rijndael_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + rijndael_dec_init(); + rijndael_dec_main(); + } + WRITE_TO_FILE return ( rijndael_dec_return() ); } diff --git a/all_pairs/source/statemate/statemate.c b/all_pairs/source/statemate/statemate.c index 2b76166..8239ed6 100644 --- a/all_pairs/source/statemate/statemate.c +++ b/all_pairs/source/statemate/statemate.c @@ -1273,12 +1273,12 @@ void _Pragma ( "entrypoint" ) statemate_main( void ) int main ( int argc, char **argv ) { - SET_UP - for_each_job { - statemate_init(); - statemate_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + statemate_init(); + statemate_main(); + } + WRITE_TO_FILE return statemate_return(); } diff --git a/all_pairs/source/susan/susan.c b/all_pairs/source/susan/susan.c index 9de5f01..14a2f28 100644 --- a/all_pairs/source/susan/susan.c +++ b/all_pairs/source/susan/susan.c @@ -2001,12 +2001,12 @@ int susan_return( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - susan_init(); - susan_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + susan_init(); + susan_main(); + } + WRITE_TO_FILE return susan_return(); } diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c index 7994390..0627c9c 100644 --- a/baseline/source/adpcm_dec/adpcm_dec.c +++ b/baseline/source/adpcm_dec/adpcm_dec.c @@ -709,9 +709,9 @@ int main(int argc, char **argv) { SET_UP for_each_job { - adpcm_dec_init(); - adpcm_dec_main(); -} -WRITE_TO_FILE + adpcm_dec_init(); + adpcm_dec_main(); + } + WRITE_TO_FILE return ( adpcm_dec_return() ); } diff --git a/baseline/source/adpcm_enc/adpcm_enc.c b/baseline/source/adpcm_enc/adpcm_enc.c index 661bcc6..118382f 100644 --- a/baseline/source/adpcm_enc/adpcm_enc.c +++ b/baseline/source/adpcm_enc/adpcm_enc.c @@ -746,11 +746,11 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void) int main(int argc, char **argv) { - SET_UP - for_each_job { - adpcm_enc_init(); - adpcm_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + adpcm_enc_init(); + adpcm_enc_main(); + } + WRITE_TO_FILE return adpcm_enc_return(); } diff --git a/baseline/source/ammunition/ammunition.c b/baseline/source/ammunition/ammunition.c index 90e89d6..4ae488b 100644 --- a/baseline/source/ammunition/ammunition.c +++ b/baseline/source/ammunition/ammunition.c @@ -1173,11 +1173,11 @@ void _Pragma( "entrypoint" ) ammunition_main( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - ammunition_init(); - ammunition_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + ammunition_init(); + ammunition_main(); + } + WRITE_TO_FILE return ( ammunition_return() ); } diff --git a/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c index 1061470..fc8b6a8 100644 --- a/baseline/source/anagram/anagram.c +++ b/baseline/source/anagram/anagram.c @@ -658,11 +658,11 @@ void _Pragma( "entrypoint" ) anagram_main( void ) int main(int argc, char **argv) { - SET_UP - for_each_job { - anagram_init(); - anagram_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + anagram_init(); + anagram_main(); + } + WRITE_TO_FILE return anagram_return(); } diff --git a/baseline/source/audiobeam/audiobeam.c b/baseline/source/audiobeam/audiobeam.c index 7d89f06..5f23daf 100644 --- a/baseline/source/audiobeam/audiobeam.c +++ b/baseline/source/audiobeam/audiobeam.c @@ -579,13 +579,13 @@ void _Pragma( "entrypoint" ) audiobeam_main( void ) int main( int argc, char **argv ) -{ - SET_UP - for_each_job { - audiobeam_init(); - audiobeam_main(); - } - WRITE_TO_FILE +{ + SET_UP + for_each_job { + audiobeam_init(); + audiobeam_main(); + } + WRITE_TO_FILE return ( audiobeam_return() ); } diff --git a/baseline/source/cjpeg_transupp/cjpeg_transupp.c b/baseline/source/cjpeg_transupp/cjpeg_transupp.c index 4a95fe1..112fba1 100644 --- a/baseline/source/cjpeg_transupp/cjpeg_transupp.c +++ b/baseline/source/cjpeg_transupp/cjpeg_transupp.c @@ -706,11 +706,11 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void ) int main(int argc, char **argv) { - SET_UP - for_each_job { - cjpeg_transupp_init(); - cjpeg_transupp_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + cjpeg_transupp_init(); + cjpeg_transupp_main(); + } + WRITE_TO_FILE return ( cjpeg_transupp_return() - 660 != 0 ); } diff --git a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c index 57daca4..a7aa477 100644 --- a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c +++ b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c @@ -210,13 +210,13 @@ int cjpeg_wrbmp_return() int main(int argc, char **argv) { - SET_UP - for_each_job { - cjpeg_wrbmp_init(); - cjpeg_wrbmp_main(); - } - WRITE_TO_FILE - return ( cjpeg_wrbmp_return() ); + SET_UP + for_each_job { + cjpeg_wrbmp_init(); + cjpeg_wrbmp_main(); + } + WRITE_TO_FILE + return ( cjpeg_wrbmp_return() ); } #endif /* BMP_SUPPORTED */ diff --git a/baseline/source/dijkstra/dijkstra.c b/baseline/source/dijkstra/dijkstra.c index e9b115e..6602918 100644 --- a/baseline/source/dijkstra/dijkstra.c +++ b/baseline/source/dijkstra/dijkstra.c @@ -192,11 +192,11 @@ void _Pragma( "entrypoint" ) dijkstra_main( void ) int main(int argc, char** argv ) { - SET_UP - for_each_job { - dijkstra_init(); - dijkstra_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + dijkstra_init(); + dijkstra_main(); + } + WRITE_TO_FILE return ( dijkstra_return() ); } diff --git a/baseline/source/fmref/fmref.c b/baseline/source/fmref/fmref.c index ccd5954..b086f5a 100644 --- a/baseline/source/fmref/fmref.c +++ b/baseline/source/fmref/fmref.c @@ -77,12 +77,12 @@ int fmref_return(void) int main(int argc, char **argv){ - SET_UP - for_each_job { - fmref_init(); - fmref_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + fmref_init(); + fmref_main(); + } + WRITE_TO_FILE return fmref_return(); } diff --git a/baseline/source/g723_enc/g723_enc.c b/baseline/source/g723_enc/g723_enc.c index 646adcd..bf2df51 100644 --- a/baseline/source/g723_enc/g723_enc.c +++ b/baseline/source/g723_enc/g723_enc.c @@ -875,12 +875,12 @@ void _Pragma( "entrypoint" ) g723_enc_main() int main( int argc, char **argv ) { - SET_UP - for_each_job { - g723_enc_init(); - g723_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + g723_enc_init(); + g723_enc_main(); + } + WRITE_TO_FILE return ( g723_enc_return() ); } diff --git a/baseline/source/gsm_dec/gsm_dec.c b/baseline/source/gsm_dec/gsm_dec.c index be6513c..abde144 100644 --- a/baseline/source/gsm_dec/gsm_dec.c +++ b/baseline/source/gsm_dec/gsm_dec.c @@ -752,11 +752,11 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void ) int main( int argc, char **argv) { - SET_UP - for_each_job { - gsm_dec_init(); - gsm_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + gsm_dec_init(); + gsm_dec_main(); + } + WRITE_TO_FILE return ( gsm_dec_return() ); } diff --git a/baseline/source/gsm_enc/gsm_enc.c b/baseline/source/gsm_enc/gsm_enc.c index 86f062b..75e2e7f 100644 --- a/baseline/source/gsm_enc/gsm_enc.c +++ b/baseline/source/gsm_enc/gsm_enc.c @@ -2060,11 +2060,11 @@ void gsm_enc_main( void ) int main( int argc, char** argv ) { - SET_UP - for_each_job { - gsm_enc_init(); - gsm_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + gsm_enc_init(); + gsm_enc_main(); + } + WRITE_TO_FILE return ( gsm_enc_return() ); } diff --git a/baseline/source/h264_dec/h264_dec.c b/baseline/source/h264_dec/h264_dec.c index 4b1d939..1abd883 100644 --- a/baseline/source/h264_dec/h264_dec.c +++ b/baseline/source/h264_dec/h264_dec.c @@ -597,12 +597,12 @@ void _Pragma( "entrypoint" ) h264_dec_main( void ) int main( int argc, char** argv ) { - SET_UP - for_each_job { - h264_dec_init(); - h264_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + h264_dec_init(); + h264_dec_main(); + } + WRITE_TO_FILE return ( h264_dec_return() ); } diff --git a/baseline/source/huff_dec/huff_dec.c b/baseline/source/huff_dec/huff_dec.c index e0ebc19..8ebf2f7 100644 --- a/baseline/source/huff_dec/huff_dec.c +++ b/baseline/source/huff_dec/huff_dec.c @@ -381,11 +381,11 @@ void _Pragma( "entrypoint" ) huff_dec_main( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - huff_dec_init(); - huff_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + huff_dec_init(); + huff_dec_main(); + } + WRITE_TO_FILE return ( huff_dec_return() ); } diff --git a/baseline/source/huff_enc/huff_enc.c b/baseline/source/huff_enc/huff_enc.c index 02522aa..f2db552 100644 --- a/baseline/source/huff_enc/huff_enc.c +++ b/baseline/source/huff_enc/huff_enc.c @@ -577,11 +577,11 @@ void _Pragma( "entrypoint" ) huff_enc_main() int main( int argc, char **argv ) { - SET_UP - for_each_job { - huff_enc_init(); - huff_enc_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + huff_enc_init(); + huff_enc_main(); + } + WRITE_TO_FILE return ( huff_enc_return() ); } diff --git a/baseline/source/mpeg2/mpeg2.c b/baseline/source/mpeg2/mpeg2.c index cc4c215..cceeb30 100644 --- a/baseline/source/mpeg2/mpeg2.c +++ b/baseline/source/mpeg2/mpeg2.c @@ -13205,12 +13205,12 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - mpeg2_init(); - mpeg2_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + mpeg2_init(); + mpeg2_main(); + } + WRITE_TO_FILE return( mpeg2_return() - (-116) != 0 ); } diff --git a/baseline/source/ndes/ndes.c b/baseline/source/ndes/ndes.c index b919018..5d00d94 100644 --- a/baseline/source/ndes/ndes.c +++ b/baseline/source/ndes/ndes.c @@ -365,12 +365,12 @@ void _Pragma( "entrypoint" ) ndes_main() int main( int argc, char **argv ) { - SET_UP - for_each_job { - ndes_init(); - ndes_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + ndes_init(); + ndes_main(); + } + WRITE_TO_FILE return ( ndes_return() ); } diff --git a/baseline/source/petrinet/petrinet.c b/baseline/source/petrinet/petrinet.c index 79da104..a54a999 100644 --- a/baseline/source/petrinet/petrinet.c +++ b/baseline/source/petrinet/petrinet.c @@ -976,12 +976,10 @@ int petrinet_return( void ) int main( int argc, char **argv ) { SET_UP - - for_each_job { - - petrinet_main(); - } - WRITE_TO_FILE + for_each_job { + petrinet_main(); + } + WRITE_TO_FILE return ( petrinet_return() ); } diff --git a/baseline/source/rijndael_dec/rijndael_dec.c b/baseline/source/rijndael_dec/rijndael_dec.c index ccd6a65..c8f606b 100644 --- a/baseline/source/rijndael_dec/rijndael_dec.c +++ b/baseline/source/rijndael_dec/rijndael_dec.c @@ -182,12 +182,12 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void ) int main(int argc, char** argv) { - SET_UP - for_each_job { - rijndael_dec_init(); - rijndael_dec_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + rijndael_dec_init(); + rijndael_dec_main(); + } + WRITE_TO_FILE return ( rijndael_dec_return() ); } diff --git a/baseline/source/statemate/statemate.c b/baseline/source/statemate/statemate.c index 2b76166..8239ed6 100644 --- a/baseline/source/statemate/statemate.c +++ b/baseline/source/statemate/statemate.c @@ -1273,12 +1273,12 @@ void _Pragma ( "entrypoint" ) statemate_main( void ) int main ( int argc, char **argv ) { - SET_UP - for_each_job { - statemate_init(); - statemate_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + statemate_init(); + statemate_main(); + } + WRITE_TO_FILE return statemate_return(); } diff --git a/baseline/source/susan/susan.c b/baseline/source/susan/susan.c index 9de5f01..14a2f28 100644 --- a/baseline/source/susan/susan.c +++ b/baseline/source/susan/susan.c @@ -2001,12 +2001,12 @@ int susan_return( void ) int main( int argc, char **argv ) { - SET_UP - for_each_job { - susan_init(); - susan_main(); - } - WRITE_TO_FILE + SET_UP + for_each_job { + susan_init(); + susan_main(); + } + WRITE_TO_FILE return susan_return(); } diff --git a/dis/run_all_dis.sh b/dis/run_all_dis.sh deleted file mode 100755 index 5a6b6e1..0000000 --- a/dis/run_all_dis.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# Run baselines for all the DIS tasks -if [ "$EUID" -ne 0 ] -then - echo "You need to be root to enable cache way and interrupt isolation!" - exit -fi - -if uname -a | grep -q "mc2"; then - echo "MC^2 detected! Cache isolation will be enabled" - iso="i" -else - echo "MC^2 not detected." - iso="xi" -fi - -datestring=$(date +"%b%d-%H") -if ! grep -q irqaffinity /proc/cmdline; then - /playpen/move_interrupts_off_core15.sh -else - echo "performance" > /sys/devices/system/cpu/cpu15/cpufreq/scaling_governor -fi -WSSS=WSSS_maxstride2mb -caches=caches_all -# Consider re-enabling this only if you're interested in exploring bandwidth effects -#./setup_mem_and_global.sh -if [[ $1 == "--contend" ]]; then - echo "Will run 6 contending tasks" - echo "Files will be named $datestring--c-"$iso".txt" - echo "Please verify the above settings. Press enter to continue..." - read - # Run two contending tasks on each other CCX - taskset -c 1 /playpen/mc2/imx6q-thrasher/thrasher & - taskset -c 2 /playpen/mc2/imx6q-thrasher/thrasher & - taskset -c 5 /playpen/mc2/imx6q-thrasher/thrasher & - taskset -c 6 /playpen/mc2/imx6q-thrasher/thrasher & - taskset -c 9 /playpen/mc2/imx6q-thrasher/thrasher & - taskset -c 10 /playpen/mc2/imx6q-thrasher/thrasher & - ./run_dis.sh 15 10 $datestring-field-c-$iso Field inputs/Field/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-field-c-$iso - ./run_dis.sh 15 10 $datestring-matrix-c-$iso Matrix inputs/Matrix/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-matrix-c-$iso - ./run_dis.sh 15 10 $datestring-neighborhood-c-$iso Neighborhood inputs/Neighborhood/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-neighborhood-c-$iso - ./run_dis.sh 15 10 $datestring-pointer-c-$iso Pointer inputs/Pointer/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-pointer-c-$iso - ./run_dis.sh 15 10 $datestring-transitive-c-$iso Transitive inputs/Transitive/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-transitive-c-$iso - ./run_dis.sh 15 10 $datestring-update-c-$iso Update inputs/Update/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-update-c-$iso - killall thrasher -else - echo "Will run no contending tasks (use --contend for contending tasks)" - echo "Files will be named $datestring--xc-"$iso".txt" - echo "Please verify the above settings. Press enter to continue..." - read - killall thrasher - ./run_dis.sh 15 10 $datestring-field-xc-$iso Field inputs/Field/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-field-xc-$iso - ./run_dis.sh 15 10 $datestring-matrix-xc-$iso Matrix inputs/Matrix/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-matrix-xc-$iso - ./run_dis.sh 15 10 $datestring-neighborhood-xc-$iso Neighborhood inputs/Neighborhood/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-neighborhood-xc-$iso - ./run_dis.sh 15 10 $datestring-pointer-xc-$iso Pointer inputs/Pointer/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-pointer-xc-$iso - ./run_dis.sh 15 10 $datestring-transitive-xc-$iso Transitive inputs/Transitive/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-transitive-xc-$iso - ./run_dis.sh 15 10 $datestring-update-xc-$iso Update inputs/Update/in0 inputs/$WSSS inputs/$caches - ./postproc.sh $datestring-update-xc-$iso -fi diff --git a/extra.h b/extra.h index 3215951..a15313a 100644 --- a/extra.h +++ b/extra.h @@ -1,5 +1,5 @@ /** - * Copyright 2019 Sims Hill Osborne and Joshua Bakita + * Copyright 2019 Sims Hill Osborne and 2020 Joshua Bakita * * This header provides facilities by which to separably run and time TACLeBench * To use this for paired task timing, define PAIRED (pass CFLAGS=-DPAIRED to make) diff --git a/run_all_dis.sh b/run_all_dis.sh new file mode 100755 index 0000000..5a6b6e1 --- /dev/null +++ b/run_all_dis.sh @@ -0,0 +1,70 @@ +#!/bin/bash +# Run baselines for all the DIS tasks +if [ "$EUID" -ne 0 ] +then + echo "You need to be root to enable cache way and interrupt isolation!" + exit +fi + +if uname -a | grep -q "mc2"; then + echo "MC^2 detected! Cache isolation will be enabled" + iso="i" +else + echo "MC^2 not detected." + iso="xi" +fi + +datestring=$(date +"%b%d-%H") +if ! grep -q irqaffinity /proc/cmdline; then + /playpen/move_interrupts_off_core15.sh +else + echo "performance" > /sys/devices/system/cpu/cpu15/cpufreq/scaling_governor +fi +WSSS=WSSS_maxstride2mb +caches=caches_all +# Consider re-enabling this only if you're interested in exploring bandwidth effects +#./setup_mem_and_global.sh +if [[ $1 == "--contend" ]]; then + echo "Will run 6 contending tasks" + echo "Files will be named $datestring--c-"$iso".txt" + echo "Please verify the above settings. Press enter to continue..." + read + # Run two contending tasks on each other CCX + taskset -c 1 /playpen/mc2/imx6q-thrasher/thrasher & + taskset -c 2 /playpen/mc2/imx6q-thrasher/thrasher & + taskset -c 5 /playpen/mc2/imx6q-thrasher/thrasher & + taskset -c 6 /playpen/mc2/imx6q-thrasher/thrasher & + taskset -c 9 /playpen/mc2/imx6q-thrasher/thrasher & + taskset -c 10 /playpen/mc2/imx6q-thrasher/thrasher & + ./run_dis.sh 15 10 $datestring-field-c-$iso Field inputs/Field/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-field-c-$iso + ./run_dis.sh 15 10 $datestring-matrix-c-$iso Matrix inputs/Matrix/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-matrix-c-$iso + ./run_dis.sh 15 10 $datestring-neighborhood-c-$iso Neighborhood inputs/Neighborhood/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-neighborhood-c-$iso + ./run_dis.sh 15 10 $datestring-pointer-c-$iso Pointer inputs/Pointer/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-pointer-c-$iso + ./run_dis.sh 15 10 $datestring-transitive-c-$iso Transitive inputs/Transitive/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-transitive-c-$iso + ./run_dis.sh 15 10 $datestring-update-c-$iso Update inputs/Update/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-update-c-$iso + killall thrasher +else + echo "Will run no contending tasks (use --contend for contending tasks)" + echo "Files will be named $datestring--xc-"$iso".txt" + echo "Please verify the above settings. Press enter to continue..." + read + killall thrasher + ./run_dis.sh 15 10 $datestring-field-xc-$iso Field inputs/Field/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-field-xc-$iso + ./run_dis.sh 15 10 $datestring-matrix-xc-$iso Matrix inputs/Matrix/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-matrix-xc-$iso + ./run_dis.sh 15 10 $datestring-neighborhood-xc-$iso Neighborhood inputs/Neighborhood/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-neighborhood-xc-$iso + ./run_dis.sh 15 10 $datestring-pointer-xc-$iso Pointer inputs/Pointer/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-pointer-xc-$iso + ./run_dis.sh 15 10 $datestring-transitive-xc-$iso Transitive inputs/Transitive/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-transitive-xc-$iso + ./run_dis.sh 15 10 $datestring-update-xc-$iso Update inputs/Update/in0 inputs/$WSSS inputs/$caches + ./postproc.sh $datestring-update-xc-$iso +fi -- cgit v1.2.2