Changeset a5121bf
- Timestamp:
- Aug 7, 2018, 3:23:34 PM (6 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
- Children:
- 575a6e5
- Parents:
- 524ed86
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.am
r524ed86 ra5121bf 36 36 debug=yes 37 37 check: 38 $(MAKE) -C tests all-tests install =no debug=${debug}38 $(MAKE) -C tests all-tests installed=no debug=${debug} 39 39 40 40 installcheck: 41 $(MAKE) -C tests all-tests install =yes debug=${debug}41 $(MAKE) -C tests all-tests installed=yes debug=${debug} -
Makefile.in
r524ed86 ra5121bf 900 900 @cd $(dir $@) && $(abs_top_srcdir)/libcfa/configure $(config_data) 901 901 check: 902 $(MAKE) -C tests all-tests install =no debug=${debug}902 $(MAKE) -C tests all-tests installed=no debug=${debug} 903 903 904 904 installcheck: 905 $(MAKE) -C tests all-tests install =yes debug=${debug}905 $(MAKE) -C tests all-tests installed=yes debug=${debug} 906 906 907 907 # Tell versions [3.59,3.63) of GNU make to not export all variables. -
automake/cfa.m4
r524ed86 ra5121bf 26 26 27 27 if test "$libdir" = '${exec_prefix}/lib'; then 28 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}" 28 if test "${ARCHITECTURE}" != ""; then 29 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/" 30 else 31 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/" 32 fi 29 33 else 30 34 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}" -
configure
r524ed86 ra5121bf 3266 3266 3267 3267 if test "$libdir" = '${exec_prefix}/lib'; then 3268 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}" 3268 if test "${ARCHITECTURE}" != ""; then 3269 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/" 3270 else 3271 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/" 3272 fi 3269 3273 else 3270 3274 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}" … … 3450 3454 3451 3455 lib_arch=${cannon_arch_name} 3452 lib_dir="libcfa -${lib_arch}-${lib_config}"3456 lib_dir="libcfa/${lib_arch}-${lib_config}" 3453 3457 3454 3458 LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}" 3455 3459 LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile" 3456 3460 3457 mkdir -p libcfa-${lib_arch}-${lib_config}3458 echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data3459 echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data3460 echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data3461 echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data3461 mkdir -p ${lib_dir} 3462 echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data 3463 echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data 3464 echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data 3465 echo -n "CONFIGURATION=${lib_config}" >> ${lib_dir}/config.data 3462 3466 done 3463 3467 -
configure.ac
r524ed86 ra5121bf 145 145 M4CFA_CANNON_CPU([${arch_name}]) 146 146 lib_arch=${cannon_arch_name} 147 lib_dir="libcfa -${lib_arch}-${lib_config}"147 lib_dir="libcfa/${lib_arch}-${lib_config}" 148 148 149 149 LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}" 150 150 LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile" 151 151 152 mkdir -p libcfa-${lib_arch}-${lib_config}153 echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data154 echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data155 echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data156 echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data152 mkdir -p ${lib_dir} 153 echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data 154 echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data 155 echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data 156 echo -n "CONFIGURATION=${lib_config}" >> ${lib_dir}/config.data 157 157 done 158 158 -
driver/cfa.cc
r524ed86 ra5121bf 86 86 string Major( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) ); 87 87 88 string installincdir( CFA_INCDIR ); // fixed location of include files 89 string installlibdir( CFA_LIBDIR ); // fixed location of cc1 and cfa-cpp commands 88 string installincdir( CFA_INCDIR ); // fixed location of include files 89 string installlibdir( CFA_LIBDIR ); // fixed location of cc1 and cfa-cpp commands when installed 90 string srcdriverdir ( TOP_BUILDDIR "driver"); // fixed location of cc1 and cfa-cpp commands when in tree 90 91 91 92 string heading; // banner printed at start of cfa compilation … … 171 172 noincstd_flag = true; // strip the no-include-stdhdr flag 172 173 } else if ( arg == "-in-tree" ) { 173 noincstd_flag = true;174 174 intree = true; 175 175 } else if ( arg == "-compiler" ) { … … 338 338 339 339 // add the CFA include-library paths, which allow direct access to header files without directory qualification 340 args[nargs] = "-I" CFA_INCDIR;341 nargs += 1;342 if ( ! noincstd_flag ) { // do not use during build343 args[nargs] = "-I" CFA_INCDIR "/stdhdr";344 nargs += 1;345 } // if346 args[nargs] = "-I" CFA_INCDIR "/concurrency";347 nargs += 1;348 args[nargs] = "-I" CFA_INCDIR "/containers";349 nargs += 1;350 351 string libdir;352 340 if( !intree ) { 353 const char * const arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU); 354 const char * config = debug ? "debug": "nodebug"; 355 libdir = string(CFA_LIBDIR) + arch + config; 356 if( !dirExists(libdir) ) { 357 cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl; 358 libdir = string(CFA_LIBDIR) + arch + "nolib"; 359 } 360 361 if( !dirExists(libdir) ) { 362 cerr << argv[0] << " internal error, cannot find prelude directory." << endl; 363 cerr << "Was looking for " << libdir << endl; 364 exit( EXIT_FAILURE ); 365 } 366 367 args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir) ).c_str(); 341 args[nargs] = "-I" CFA_INCDIR; 342 nargs += 1; 343 if ( ! noincstd_flag ) { // do not use during build 344 args[nargs] = "-I" CFA_INCDIR "/stdhdr"; 345 nargs += 1; 346 } // if 347 args[nargs] = "-I" CFA_INCDIR "/concurrency"; 348 nargs += 1; 349 args[nargs] = "-I" CFA_INCDIR "/containers"; 368 350 nargs += 1; 369 351 } else { 352 args[nargs] = "-I" TOP_SRCDIR "libcfa/src"; 353 nargs += 1; 354 if ( ! noincstd_flag ) { // do not use during build 355 args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr"; 356 nargs += 1; 357 } // if 358 args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/concurrency"; 359 nargs += 1; 360 args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/containers"; 361 nargs += 1; 362 } 363 364 string libbase; 365 if( !intree ) { 366 libbase = CFA_LIBDIR; 367 } else { 368 libbase = TOP_BUILDDIR "libcfa/"; 370 369 args[nargs] = "-D__CFA_FLAG__=-t"; 371 370 nargs += 1; 372 371 } 372 373 const char * const arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU); 374 const char * config = debug ? "debug": "nodebug"; 375 string libdir = libbase + arch + "-" + config; 376 if( !dirExists(libdir) ) { 377 cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl; 378 cerr << "Was looking for " << libdir << endl; 379 libdir = libbase + arch + "-" + "nolib"; 380 } 381 382 if( !dirExists(libdir) ) { 383 cerr << argv[0] << " internal error, cannot find prelude directory." << endl; 384 cerr << "Was looking for " << libdir << endl; 385 exit( EXIT_FAILURE ); 386 } 387 388 args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + (intree ? "/prelude" : "")) ).c_str(); 389 nargs += 1; 373 390 374 391 if ( link ) { … … 387 404 388 405 // include the cfa library in case it's needed 389 if( !intree ) { 390 args[nargs] = ( *new string( string("-L" ) + libdir) ).c_str(); 391 nargs += 1; 392 } 406 args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src" : "")) ).c_str(); 407 nargs += 1; 393 408 args[nargs] = "-lcfa"; 394 409 nargs += 1; … … 445 460 446 461 if ( Bprefix.length() == 0 ) { 447 Bprefix = installlibdir;462 Bprefix = !intree ? installlibdir : srcdriverdir; 448 463 args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str(); 449 464 nargs += 1; -
libcfa/configure
r524ed86 ra5121bf 2584 2584 2585 2585 if test "$libdir" = '${exec_prefix}/lib'; then 2586 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}" 2586 if test "${ARCHITECTURE}" != ""; then 2587 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/" 2588 else 2589 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/" 2590 fi 2587 2591 else 2588 2592 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}" -
libcfa/src/Makefile.am
r524ed86 ra5121bf 28 28 # use -no-include-stdhdr to prevent rebuild cycles 29 29 # The built sources must not depend on the installed headers 30 AM_CFAFLAGS = -quiet -in-tree - B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr30 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr 31 31 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ 32 32 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ -
libcfa/src/Makefile.in
r524ed86 ra5121bf 339 339 # use -no-include-stdhdr to prevent rebuild cycles 340 340 # The built sources must not depend on the installed headers 341 AM_CFAFLAGS = -quiet -in-tree - B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr341 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr 342 342 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ 343 343 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ -
tests/Makefile.am
r524ed86 ra5121bf 31 31 -Wno-unused-function \ 32 32 -quiet @CFA_FLAGS@ \ 33 -DIN_DIR="${srcdir}/.in/" \ 34 @BUILD_IN_TREE_FLAGS@ 33 -DIN_DIR="${srcdir}/.in/" 35 34 36 AM_CFLAGS += ${DEBUG_FLAGS} 35 AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} 37 36 38 37 CC = @CFACC@ … … 48 47 #---------------------------------------------------------------------------------------------------------------- 49 48 all-local : 50 @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}49 @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${quick_test} 51 50 52 51 all-tests : 53 @+${TEST_PY} --all --debug=${debug} ${concurrent} # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program52 @+${TEST_PY} --all --debug=${debug} --install=${installed} ${concurrent} # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program 54 53 55 54 clean-local : … … 66 65 67 66 concurrency : 68 @+${TEST_PY} --debug=${debug} -Iconcurrent67 @+${TEST_PY} --debug=${debug} --install=${installed} -Iconcurrent 69 68 70 69 #---------------------------------------------------------------------------------------------------------------- -
tests/Makefile.in
r524ed86 ra5121bf 303 303 # applies to both programs 304 304 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \ 305 -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \306 @BUILD_IN_TREE_FLAGS@ ${DEBUG_FLAGS}305 -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" ${DEBUG_FLAGS} \ 306 ${INSTALL_FLAGS} 307 307 fstream_test_SOURCES = fstream_test.c 308 308 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c … … 613 613 #---------------------------------------------------------------------------------------------------------------- 614 614 all-local : 615 @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}615 @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${quick_test} 616 616 617 617 all-tests : 618 @+${TEST_PY} --all --debug=${debug} ${concurrent} # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program618 @+${TEST_PY} --all --debug=${debug} --install=${installed} ${concurrent} # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program 619 619 620 620 clean-local : … … 631 631 632 632 concurrency : 633 @+${TEST_PY} --debug=${debug} -Iconcurrent633 @+${TEST_PY} --debug=${debug} --install=${installed} -Iconcurrent 634 634 635 635 #---------------------------------------------------------------------------------------------------------------- -
tests/pybin/settings.py
r524ed86 ra5121bf 67 67 self.flags = """DEBUG_FLAGS="%s" """ % ("-debug" if value else "-nodebug") 68 68 69 class Install: 70 def __init__(self, value): 71 self.string = "installed" if value else "in-tree" 72 self.flags = """INSTALL_FLAGS="%s" """ % ("" if value else "-in-tree") 73 69 74 def init( options ): 70 75 global arch … … 73 78 global make 74 79 global debug 75 global debugFlag80 global install 76 81 77 82 dry_run = options.dry_run … … 79 84 make = 'make' 80 85 debug = Debug(options.debug) 86 install = Install(options.install) 81 87 arch = Architecture(options.arch) 82 88 -
tests/pybin/tools.py
r524ed86 ra5121bf 102 102 test_param, 103 103 settings.debug.flags, 104 settings.install.flags, 104 105 flags, 105 106 target, -
tests/test.py
r524ed86 ra5121bf 86 86 parser = argparse.ArgumentParser(description='Script which runs cforall tests') 87 87 parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='yes') 88 parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=yes_no, default='no') 88 89 parser.add_argument('--arch', help='Test for specific architecture', type=str, default='') 89 90 parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
Note: See TracChangeset
for help on using the changeset viewer.