Changeset cdbab55 for tests


Ignore:
Timestamp:
Aug 21, 2018, 2:24:29 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
2a6292d
Parents:
2b79a70 (diff), efa8b6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:
tests
Files:
19 added
270 moved

Legend:

Unmodified
Added
Removed

  • tests/.expect/io1.txt

    r2b79a70 rcdbab55  
    88
    99closing delimiters
    10 1, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x
     101, x 2. x 3; x 4! x 5? x 6% x 7 ¢ x 8 » x 9) x 10] x 11} x
    1111
    1212opening/closing delimiters

  • tests/.expect/math1.txt

    r2b79a70 rcdbab55  
    99exp2:2 2 2
    1010expm1:1.71828 1.71828182845905 1.71828182845904524
    11 pow:1 1 1 0.273957+0.583701i 0.273957253830121+0.583700758758615i 0.273957253830121071+0.583700758758614627i
     11pow:1 1 1 0.273957+0.583701i 0.273957253830121+0.583700758758615i -0.638110484918098871+0.705394566961838155i
    1212\ 16 256
    1313\ 912673 256 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i

  • tests/.expect/time.txt

    r2b79a70 rcdbab55  
    1 10800 2 3.07 12 1.00001
    2 0 2 3.07
     110800 2 3.375 12 1.00001
     20 2 3.375
    337 7 7
    4414

  • tests/Makefile.in

    r2b79a70 rcdbab55  
    9191build_triplet = @build@
    9292host_triplet = @host@
    93 @BUILD_DEBUG_FALSE@am__append_1 = -nodebug
    94 @BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_2 = -debug
    95 @BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_3 = ${DEBUG_FLAGS}
    9693EXTRA_PROGRAMS = fstream_test$(EXEEXT) avl_test$(EXEEXT)
    97 subdir = src/tests
     94subdir = tests
    9895ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    99 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     96am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     97        $(top_srcdir)/configure.ac
    10098am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    10199        $(ACLOCAL_M4)
    … …  
    182180BACKEND_CC = @BACKEND_CC@
    183181BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    184 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    185182CC = @CFACC@
    186183CCAS = @CCAS@
    … …  
    213210EXEEXT = @EXEEXT@
    214211GREP = @GREP@
     212HOST_FLAGS = @HOST_FLAGS@
    215213INSTALL = @INSTALL@
    216214INSTALL_DATA = @INSTALL_DATA@
    … …  
    222220LEXLIB = @LEXLIB@
    223221LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     222LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     223LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    224224LIBOBJS = @LIBOBJS@
    225225LIBS = @LIBS@
    226226LTLIBOBJS = @LTLIBOBJS@
    227 MACHINE_TYPE = @MACHINE_TYPE@
    228227MAKEINFO = @MAKEINFO@
    229228MKDIR_P = @MKDIR_P@
    … …  
    241240SHELL = @SHELL@
    242241STRIP = @STRIP@
     242TARGET_HOSTS = @TARGET_HOSTS@
    243243VERSION = @VERSION@
    244244YACC = @YACC@
    … …  
    296296top_builddir = @top_builddir@
    297297top_srcdir = @top_srcdir@
     298AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    298299debug = yes
     300installed = no
    299301quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
    300 @BUILD_CONCURRENCY_FALSE@concurrent = '-Econcurrent'
    301 @BUILD_CONCURRENCY_TRUE@concurrent =
    302 TEST_PY = python ${srcdir}/test.py
     302concurrent =
     303TEST_PY = python ${builddir}/test.py
    303304
    304305# applies to both programs
    305306AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
    306         -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
    307         @BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
    308         $(am__append_3)
     307        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" ${DEBUG_FLAGS} \
     308        ${INSTALL_FLAGS} ${ARCH_FLAGS}
     309PRETTY_PATH = cd ${srcdir} &&
    309310fstream_test_SOURCES = fstream_test.c
    310311avl_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
    311 
    312 # SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
    313 # however, here it is more complicated because it must match the dependencies based on how
    314 # they are generated by gcc
    315 headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
    316 headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
    317 headers_deps = $(addprefix %/, $(headers_real))
    318312all: all-am
    319313
    320314.SUFFIXES:
    321 .SUFFIXES: .c .o .obj
     315.SUFFIXES: .c .o .obj .validate
    322316$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    323317        @for dep in $?; do \
    … …  
    329323          esac; \
    330324        done; \
    331         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/Makefile'; \
     325        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
    332326        $(am__cd) $(top_srcdir) && \
    333           $(AUTOMAKE) --foreign src/tests/Makefile
     327          $(AUTOMAKE) --foreign tests/Makefile
    334328Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    335329        @case '$?' in \
    … …  
    617611
    618612
    619 .PHONY : list
    620 
     613.PHONY: list .validate
     614.INTERMEDIATE: .validate .validate.c
     615
     616#----------------------------------------------------------------------------------------------------------------
    621617all-local :
    622         @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
     618        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
    623619
    624620all-tests :
    625         @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     621        @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    626622
    627623clean-local :
    … …  
    631627        @+${TEST_PY} --list ${concurrent}
    632628
     629.validate: .validate.c
     630        $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
     631
     632.validate.c:
     633        @echo "int main() { return 0; }" > ${@}
     634
    633635concurrency :
    634         @+${TEST_PY} --debug=${debug} -Iconcurrent
    635 $(headers_deps) :
    636         echo "Dummy rule, should never be called"
    637 
    638 # %/stdlib:
    639 #       echo "Dummy rule, should never be called"
    640 
     636        @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
     637
     638#----------------------------------------------------------------------------------------------------------------
    641639# implicit rule so not all test require a rule
    642640% : %.c $(CC)
    643         $(COMPILE) $(abspath ${<}) -o ${@}
     641        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    644642
    645643declarationSpecifier: declarationSpecifier.c $(CC)
    646         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     644        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    647645
    648646gccExtensions : gccExtensions.c $(CC)
    649         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     647        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    650648
    651649extension : extension.c $(CC)
    652         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     650        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    653651
    654652attributes : attributes.c $(CC)
    655         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     653        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    656654
    657655functions: functions.c $(CC)
    658         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     656        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    659657
    660658KRfunctions : KRfunctions.c $(CC)
    661         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     659        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    662660
    663661sched-ext-parse : sched-ext-parse.c $(CC)
    664         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
     662        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    665663
    666664gmp : gmp.c $(CC)
    667         $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
    668 
     665        $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
     666
     667#builtins
     668builtins/sync: builtins/sync.c $(CC)
     669        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
     670
     671#------------------------------------------------------------------------------
     672#To make errors path independent we need to cd into the correct directories
    669673completeTypeError : completeTypeError.c $(CC)
    670         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     674        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    671675
    672676typedefRedef-ERR1: typedefRedef.c $(CC)
    673         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     677        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    674678
    675679alloc-ERROR: alloc.c $(CC)
    676         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     680        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    677681
    678682fallthrough-ERROR: fallthrough.c $(CC)
    679         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     683        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    680684
    681685nested-types-ERR1: nested-types.c $(CC)
    682         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     686        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    683687
    684688nested-types-ERR2: nested-types.c $(CC)
    685         $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
     689        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    686690
    687691# Constructor/destructor tests
    688692raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
    689         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     693        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    690694
    691695raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
    692         $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
     696        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    693697
    694698raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
    695         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     699        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    696700
    697701raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
    698         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
     702        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    699703
    700704# Warnings
    701705warnings/self-assignment: warnings/self-assignment.c $(CC)
    702         $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
    703 
    704 #builtins
    705 builtins/sync: builtins/sync.c $(CC)
    706         $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
     706        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
    707707
    708708# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • tests/abs.c

    r2b79a70 rcdbab55  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // abs.c -- 
     7// abs.c --
    88//
    99// Author           : Peter A. Buhr
    … …  
    1414//
    1515
    16 #include <fstream>
    17 #include <stdlib>                                                                               // abs
     16#include <fstream.hfa>
     17#include <stdlib.hfa>                                                                           // abs
    1818
    1919int main( void ) {

  • tests/alloc.c

    r2b79a70 rcdbab55  
    1010// Created On       : Wed Feb  3 07:56:22 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jul 26 20:58:05 2018
    13 // Update Count     : 334
     12// Last Modified On : Thu Aug  9 06:21:35 2018
     13// Update Count     : 337
    1414//
    1515
    … …  
    1818#include <stdint.h>                                                                             // uintptr_t
    1919#include <stdlib.h>                                                                             // posix_memalign
    20 #include <fstream>
    21 #include <stdlib>                                                                               // access C malloc, realloc
     20#include <fstream.hfa>
     21#include <stdlib.hfa>                                                                           // access C malloc, realloc
    2222
    2323int * foo( int * p, int c ) { return p; }
    … …  
    6262        p = (int *)calloc( dim, sizeof( *p ) );                         // C array calloc, type unsafe
    6363        printf( "C   array calloc, fill 0\n" );
    64         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
     64        for ( i; dim ) { printf( "%#x ", p[i] ); }
    6565        printf( "\n" );
    6666        free( p );
    … …  
    6868        p = calloc( dim );                                  // CFA array calloc, type safe
    6969        printf( "CFA array calloc, fill 0\n" );
    70         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
     70        for ( i; dim ) { printf( "%#x ", p[i] ); }
    7171        printf( "\n" );
    7272        free( p );
    7373
    7474        p = alloc( dim );                                   // CFA array alloc, type safe
    75         for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
     75        for ( i; dim ) { p[i] = 0xdeadbeef; }
    7676        printf( "CFA array alloc, no fill\n" );
    77         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
     77        for ( i; dim ) { printf( "%#x ", p[i] ); }
    7878        printf( "\n" );
    7979        free( p );
    … …  
    8181        p = alloc( 2 * dim, fill );                         // CFA array alloc, fill
    8282        printf( "CFA array alloc, fill %#hhx\n", fill );
    83         for ( int i = 0; i < 2 * dim; i += 1 ) { printf( "%#x ", p[i] ); }
     83        for ( i; 2 * dim ) { printf( "%#x ", p[i] ); }
    8484        printf( "\n" );
    8585        // do not free
    … …  
    9090
    9191        p = (int *)realloc( p, dim * sizeof(*p) );                      // C realloc
    92         for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
     92        for ( i; dim ) { p[i] = 0xdeadbeef; }
    9393        printf( "C   realloc\n" );
    94         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
     94        for ( i; dim ) { printf( "%#x ", p[i] ); }
    9595        printf( "\n" );
    9696
    9797        p = realloc( p, 2 * dim * sizeof(*p) );             // CFA realloc
    98         for ( int i = dim; i < 2 * dim; i += 1 ) { p[i] = 0x1010101; }
     98        for ( i; dim ~ 2 * dim ) { p[i] = 0x1010101; }
    9999        printf( "CFA realloc\n" );
    100         for ( int i = 0; i < 2 * dim; i += 1 ) { printf( "%#x ", p[i] ); }
     100        for ( i; 2 * dim ) { printf( "%#x ", p[i] ); }
    101101        printf( "\n" );
    102102        // do not free
    … …  
    107107
    108108        p = alloc( p, dim );                                // CFA resize array alloc
    109         for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
     109        for ( i; dim ) { p[i] = 0xdeadbeef; }
    110110        printf( "CFA resize alloc\n" );
    111         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
     111        for ( i; dim ) { printf( "%#x ", p[i] ); }
    112112        printf( "\n" );
    113113
    114114        p = alloc( p, 2 * dim );                            // CFA resize array alloc
    115         for ( int i = dim; i < 2 * dim; i += 1 ) { p[i] = 0x1010101; }
     115        for ( i; dim ~ 2 * dim ) { p[i] = 0x1010101; }
    116116        printf( "CFA resize array alloc\n" );
    117         for ( int i = 0; i < 2 * dim; i += 1 ) { printf( "%#x ", p[i] ); }
     117        for ( i; 2 * dim ) { printf( "%#x ", p[i] ); }
    118118        printf( "\n" );
    119119
    120120        p = alloc( p, dim );                                // CFA array alloc
    121121        printf( "CFA resize array alloc\n" );
    122         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
     122        for ( i; dim ) { printf( "%#x ", p[i] ); }
    123123        printf( "\n" );
    124124
    … …  
    128128        p = alloc( p, dim, fill );                          // CFA array alloc, fill
    129129        printf( "CFA resize array alloc, fill\n" );
    130         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] ); }
     130        for ( i; dim ) { printf( "%#x ", p[i] ); }
    131131        printf( "\n" );
    132132
    133133        p = alloc( p, 2 * dim, fill );                      // CFA array alloc, fill
    134134        printf( "CFA resize array alloc, fill\n" );
    135         for ( int i = 0; i < 2 * dim; i += 1 ) { printf( "%#x ", p[i] ); }
     135        for ( i; 2 * dim ) { printf( "%#x ", p[i] ); }
    136136        printf( "\n" );
    137137
    138138        p = alloc( p, dim, fill );                          // CFA array alloc, fill
    139139        printf( "CFA resize array alloc, fill\n" );
    140         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x ", p[i] );; }
     140        for ( i; dim ) { printf( "%#x ", p[i] );; }
    141141        printf( "\n" );
    142142        free( p );
    … …  
    193193        stp = align_alloc( Alignment, dim );                // CFA array memalign
    194194        assert( (uintptr_t)stp % Alignment == 0 );
    195         for ( int i = 0; i < dim; i += 1 ) { stp[i] = (Struct){ 42, 42.5 }; }
     195        for ( i; dim ) { stp[i] = (Struct){ 42, 42.5 }; }
    196196        printf( "CFA array align_alloc\n" );
    197         for ( int i = 0; i < dim; i += 1 ) { printf( "%d %g, ", stp[i].x, stp[i].y ); }
     197        for ( i; dim ) { printf( "%d %g, ", stp[i].x, stp[i].y ); }
    198198        printf( "\n" );
    199199        free( stp );
    … …  
    202202        assert( (uintptr_t)stp % Alignment == 0 );
    203203        printf( "CFA array align_alloc, fill\n" );
    204         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x %a, ", stp[i].x, stp[i].y ); }
     204        for ( i; dim ) { printf( "%#x %a, ", stp[i].x, stp[i].y ); }
    205205        printf( "\n" );
    206206        free( stp );
    … …  
    221221        amemset( sta, fill, dim );                                                      // CFA array memset, type safe
    222222        printf( "CFA array memset\n" );
    223         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x %a, ", sta[i].x, sta[i].y ); }
     223        for ( i; dim ) { printf( "%#x %a, ", sta[i].x, sta[i].y ); }
    224224        printf( "\n" );
    225225
    226226        amemcpy( sta1, sta, dim );                                                      // CFA array memcpy, type safe
    227227        printf( "CFA array memcpy\n" );
    228         for ( int i = 0; i < dim; i += 1 ) { printf( "%#x %a, ", sta1[i].x, sta1[i].y ); }
     228        for ( i; dim ) { printf( "%#x %a, ", sta1[i].x, sta1[i].y ); }
    229229        printf( "\n" );
    230230
    … …  
    241241        stp = anew( dim, 42, 42.5 );
    242242        printf( "CFA array new initialize\n" );
    243         for ( int i = 0; i < dim; i += 1 ) { printf( "%d %g, ", stp[i].x, stp[i].y ); }
     243        for ( i; dim ) { printf( "%d %g, ", stp[i].x, stp[i].y ); }
    244244        printf( "\n" );
    245245        stp1 = anew( dim, 42, 42.5 );
    246         for ( int i = 0; i < dim; i += 1 ) { printf( "%d %g, ", stp1[i].x, stp1[i].y ); }
     246        for ( i; dim ) { printf( "%d %g, ", stp1[i].x, stp1[i].y ); }
    247247        printf( "\n" );
    248248        adelete( dim, stp, dim, stp1 );

  • tests/ato.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // ato.c -- 
    8 // 
     6//
     7// ato.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Thu Feb  4 08:10:57 2016
    … …  
    1212// Last Modified On : Thu Nov 16 18:31:56 2017
    1313// Update Count     : 89
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <stdlib>                                                                               // ato, strto
     16#include <fstream.hfa>
     17#include <stdlib.hfa>                                                                           // ato, strto
    1818
    1919int main( void ) {

  • tests/avltree/avl1.c

    r2b79a70 rcdbab55  
    11#include "avl.h"
    22// #include "cwrap.h"
    3 #include <stdlib>
     3#include <stdlib.hfa>
    44
    55forall(otype K | Comparable(K), otype V)

  • tests/avltree/avl3.c

    r2b79a70 rcdbab55  
    11#include "avl.h"
    22#include "avl-private.h"
    3 #include <stdlib>
     3#include <stdlib.hfa>
    44
    55// swaps the data within two tree nodes

  • tests/avltree/avl_test.c

    r2b79a70 rcdbab55  
    11#include "avl.h"
    22#include "avl-private.h"
    3 #include <stdlib>
     3#include <stdlib.hfa>
    44
    55extern "C" {

  • tests/complex.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // complex.c -- 
    8 // 
     6//
     7// complex.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed May 24 22:07:31 2017
    … …  
    1212// Last Modified On : Wed May 24 22:08:01 2017
    1313// Update Count     : 1
    14 // 
     14//
    1515
    1616#include <stdio.h>
    1717#include <complex.h>
    1818#ifdef __CFA__
    19 #include <fstream>
     19#include <fstream.hfa>
    2020#endif // __CFA
    2121

  • tests/concurrent/coroutineYield.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <kernel>
    3 #include <stdlib>
    4 #include <thread>
    5 #include <time>
     1#include <fstream.hfa>
     2#include <kernel.hfa>hfa>
     3#include <stdlib.hfa>
     4#include <thread.hfa>
     5#include <time.hfa>
    66
    77#define __kick_rate 150000ul

  • tests/concurrent/examples/boundedBufferEXT.c

    r2b79a70 rcdbab55  
    88// Created On       : Wed Apr 18 22:52:12 2018
    99// Last Modified By : Peter A. Buhr
    10 // Last Modified On : Wed May  2 16:12:58 2018
    11 // Update Count     : 7
     10// Last Modified On : Thu Aug 16 08:17:03 2018
     11// Update Count     : 8
    1212//
    1313
    14 #include <stdlib>                                                                               // random
    15 #include <fstream>
    16 #include <kernel>
    17 #include <thread>
     14#include <stdlib.hfa>                                                                           // random
     15#include <fstream.hfa>
     16#include <kernel.hfa>
     17#include <thread.hfa>
    1818#include <unistd.h>                                                                             // getpid
    1919
    … …  
    7373void main( Consumer & cons ) with( cons ) {
    7474        sum = 0;
    75         for ( ;; ) {
     75        for () {
    7676                yield( random( 5 ) );
    7777                int item = remove( buffer );

  • tests/concurrent/examples/boundedBufferINT.c

    r2b79a70 rcdbab55  
    88// Created On       : Mon Oct 30 12:45:13 2017
    99// Last Modified By : Peter A. Buhr
    10 // Last Modified On : Thu Apr 26 23:08:17 2018
    11 // Update Count     : 82
     10// Last Modified On : Thu Aug 16 08:17:58 2018
     11// Update Count     : 83
    1212//
    1313
    14 #include <stdlib>                                                                               // random
    15 #include <fstream>
    16 #include <kernel>
    17 #include <thread>
     14#include <stdlib.hfa>                                                                           // random
     15#include <fstream.hfa>
     16#include <kernel.hfa>
     17#include <thread.hfa>
    1818#include <unistd.h>                                                                             // getpid
    1919
    … …  
    7474void main( Consumer & cons ) with( cons ) {
    7575        sum = 0;
    76         for ( ;; ) {
     76        for () {
    7777                yield( random( 5 ) );
    7878                int item = remove( buffer );

  • tests/concurrent/examples/datingService.c

    r2b79a70 rcdbab55  
    1212//
    1313
    14 #include <stdlib>                                                                               // random
    15 #include <fstream>
    16 #include <kernel>
    17 #include <thread>
     14#include <stdlib.hfa>                                                                           // random
     15#include <fstream.hfa>
     16#include <kernel.hfa>
     17#include <thread.hfa>
    1818#include <unistd.h>                                                                             // getpid
    1919

  • tests/concurrent/examples/matrixSum.c

    r2b79a70 rcdbab55  
    1 //                               -*- Mode: C -*- 
    2 // 
     1//                               -*- Mode: C -*-
     2//
    33// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    44//
    55// The contents of this file are covered under the licence agreement in the
    66// file "LICENCE" distributed with Cforall.
    7 // 
    8 // matrixSum.c -- 
    9 // 
     7//
     8// matrixSum.c --
     9//
    1010// Author           : Peter A. Buhr
    1111// Created On       : Mon Oct  9 08:29:28 2017
    1212// Last Modified By : Peter A. Buhr
    13 // Last Modified On : Fri May 25 09:34:27 2018
    14 // Update Count     : 10
    15 // 
     13// Last Modified On : Thu Aug  9 09:17:30 2018
     14// Update Count     : 13
     15//
    1616
    17 #include <fstream>
    18 #include <kernel>
    19 #include <thread>
     17#include <fstream.hfa>
     18#include <kernel.hfa>
     19#include <thread.hfa>
    2020
    2121thread Adder {
    … …  
    3030void main( Adder & adder ) with( adder ) {                              // thread starts here
    3131        subtotal = 0;
    32         for ( int c = 0; c < cols; c += 1 ) {
     32        for ( c; cols ) {
    3333                subtotal += row[c];
    3434        } // for
    … …  
    3636
    3737int main() {
    38         const int rows = 10, cols = 1000;
     38        /* const */ int rows = 10, cols = 1000;
    3939        int matrix[rows][cols], subtotals[rows], total = 0;
    4040        processor p;                                                                            // add kernel thread
    4141
    42         for ( int r = 0; r < rows; r += 1 ) {
    43                 for ( int c = 0; c < cols; c += 1 ) {
     42        for ( r; rows ) {
     43                for ( c; cols ) {
    4444                        matrix[r][c] = 1;
    4545                } // for
    4646        } // for
    4747        Adder * adders[rows];
    48         for ( int r = 0; r < rows; r += 1 ) {                           // start threads to sum rows
     48        for ( r; rows ) {                                                                       // start threads to sum rows
    4949                adders[r] = &(*malloc()){ matrix[r], cols, subtotals[r] };
    5050//              adders[r] = new( matrix[r], cols, &subtotals[r] );
    5151        } // for
    52         for ( int r = 0; r < rows; r += 1 ) {                           // wait for threads to finish
     52        for ( r; rows ) {                                                                       // wait for threads to finish
    5353                delete( adders[r] );
    5454                total += subtotals[r];                                                  // total subtotals

  • tests/concurrent/examples/quickSort.c

    r2b79a70 rcdbab55  
    99// Created On       : Wed Dec  6 12:15:52 2017
    1010// Last Modified By : Peter A. Buhr
    11 // Last Modified On : Tue Jan 30 15:58:58 2018
    12 // Update Count     : 162
     11// Last Modified On : Thu Aug 16 08:17:41 2018
     12// Update Count     : 163
    1313//
    1414
    15 #include <fstream>
    16 #include <stdlib>
    17 #include <kernel>
    18 #include <thread>
     15#include <fstream.hfa>
     16#include <stdlib.hfa>
     17#include <kernel.hfa>
     18#include <thread.hfa>
    1919#include <string.h>                                                                             // strcmp
    2020
    … …  
    131131
    132132        if ( &unsortedfile ) {                                                          // generate output ?
    133                 for ( ;; ) {
     133                for () {
    134134                        unsortedfile | size;                                            // read number of elements in the list
    135135                  if ( eof( unsortedfile ) ) break;

  • tests/concurrent/monitor.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <kernel>
    3 #include <monitor>
    4 #include <thread>
     1#include <fstream.hfa>
     2#include <kernel.hfa>
     3#include <monitor.hfa>
     4#include <thread.hfa>
    55
    66monitor global_t {

  • tests/concurrent/multi-monitor.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <kernel>
    3 #include <monitor>
    4 #include <thread>
     1#include <fstream.hfa>
     2#include <kernel.hfa>
     3#include <monitor.hfa>
     4#include <thread.hfa>
    55
    66static int global12, global23, global13;

  • tests/concurrent/preempt.c

    r2b79a70 rcdbab55  
    1 #include <kernel>
    2 #include <thread>
    3 #include <time>
     1#include <kernel.hfa>hfa>
     2#include <thread.hfa>
     3#include <time.hfa>
    44
    55#include "long_tests.h"

  • tests/concurrent/signal/block.c

    r2b79a70 rcdbab55  
    77
    88
    9 #include <fstream>
    10 #include <kernel>
    11 #include <monitor>
    12 #include <stdlib>
    13 #include <thread>
    14 #include <time>
     9#include <fstream.hfa>
     10#include <kernel.hfa>hfa>
     11#include <monitor.hfa>
     12#include <stdlib.hfa>
     13#include <thread.hfa>
     14#include <time.hfa>
    1515
    1616#include "long_tests.h"

  • tests/concurrent/signal/disjoint.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <kernel>
    3 #include <monitor>
    4 #include <thread>
    5 #include <time>
     1#include <fstream.hfa>
     2#include <kernel.hfa>hfa>
     3#include <monitor.hfa>
     4#include <thread.hfa>
     5#include <time.hfa>
    66
    77#include "long_tests.h"

  • tests/concurrent/signal/wait.c

    r2b79a70 rcdbab55  
    55
    66
    7 #include <fstream>
    8 #include <kernel>
    9 #include <monitor>
    10 #include <stdlib>
    11 #include <thread>
    12 #include <time>
     7#include <fstream.hfa>
     8#include <kernel.hfa>hfa>
     9#include <monitor.hfa>
     10#include <stdlib.hfa>
     11#include <thread.hfa>
     12#include <time.hfa>
    1313
    1414#define __kick_rate 12000ul

  • tests/concurrent/thread.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <kernel>
    3 #include <stdlib>
    4 #include <thread>
     1#include <fstream.hfa>
     2#include <kernel.hfa>
     3#include <stdlib.hfa>
     4#include <thread.hfa>
    55
    66thread First  { semaphore* lock; };

  • tests/concurrent/waitfor/barge.c

    r2b79a70 rcdbab55  
    66//---------------------------------------------------------
    77
    8 #include <fstream>
    9 #include <kernel>
    10 #include <monitor>
    11 #include <stdlib>
    12 #include <thread>
     8#include <fstream.hfa>
     9#include <kernel.hfa>
     10#include <monitor.hfa>
     11#include <stdlib.hfa>
     12#include <thread.hfa>
    1313
    1414#include <stdbool.h>

  • tests/concurrent/waitfor/dtor.c

    r2b79a70 rcdbab55  
    44//---------------------------------------------------------
    55
    6 #include <fstream>
    7 #include <kernel>
    8 #include <monitor>
    9 #include <stdlib>
    10 #include <thread>
     6#include <fstream.hfa>
     7#include <kernel.hfa>
     8#include <monitor.hfa>
     9#include <stdlib.hfa>
     10#include <thread.hfa>
    1111
    1212#include <stdbool.h>

  • tests/concurrent/waitfor/else.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <monitor>
     1#include <fstream.hfa>
     2#include <monitor.hfa>
    33
    44#include <stdbool.h>

  • tests/concurrent/waitfor/parse.c

    r2b79a70 rcdbab55  
    88//----------------------------------------------------------------------------------------
    99
    10 #include <monitor>
     10#include <monitor.hfa>
    1111
    1212monitor M {};

  • tests/concurrent/waitfor/recurse.c

    r2b79a70 rcdbab55  
    44//-----------------------------------------------------------------
    55
    6 #include <fstream>
    7 #include <kernel>
    8 #include <monitor>
    9 #include <stdlib>
    10 #include <thread>
     6#include <fstream.hfa>
     7#include <kernel.hfa>
     8#include <monitor.hfa>
     9#include <stdlib.hfa>
     10#include <thread.hfa>
    1111
    1212#include <stdbool.h>

  • tests/concurrent/waitfor/simple.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <kernel>
    3 #include <monitor>
    4 #include <stdlib>
    5 #include <thread>
     1#include <fstream.hfa>
     2#include <kernel.hfa>
     3#include <monitor.hfa>
     4#include <stdlib.hfa>
     5#include <thread.hfa>
    66
    77#include <time.h>

  • tests/concurrent/waitfor/statment.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
    2 #include <kernel>
    3 #include <monitor>
    4 #include <thread>
     1#include <fstream.hfa>
     2#include <kernel.hfa>
     3#include <monitor.hfa>
     4#include <thread.hfa>
    55
    66#include <stdbool.h>

  • tests/concurrent/waitfor/when.c

    r2b79a70 rcdbab55  
    44//-----------------------------------------------------------------
    55
    6 #include <fstream>
    7 #include <kernel>
    8 #include <monitor>
    9 #include <stdlib>
    10 #include <thread>
     6#include <fstream.hfa>
     7#include <kernel.hfa>
     8#include <monitor.hfa>
     9#include <stdlib.hfa>
     10#include <thread.hfa>
    1111
    1212#include <stdbool.h>

  • tests/config.py.in

    r2b79a70 rcdbab55  
    55"""
    66
    7 SRCDIR   = "@srcdir@"
    8 BUILDDIR = "@builddir@"
     7SRCDIR   = "@abs_srcdir@"
     8BUILDDIR = "@abs_builddir@"
    99HOSTARCH = "@host_cpu@"

  • tests/coroutine/.in/fmtLines.txt

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // fmtLines.cc -- 
    8 // 
     6//
     7// fmtLines.cc --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Sun Sep 17 21:56:15 2017
    … …  
    1212// Last Modified On : Mon Sep 18 11:35:57 2017
    1313// Update Count     : 31
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <coroutine>
     16#include <fstream.hfa>
     17#include <coroutine.hfa>
    1818
    1919coroutine Format {

  • tests/coroutine/fibonacci.c

    r2b79a70 rcdbab55  
    66//
    77// fibonacci.c -- 3-state finite-state machine
    8 
    98//
    109// Author           : Thierry Delisle
    1110// Created On       : Thu Jun  8 07:29:37 2017
    1211// Last Modified By : Peter A. Buhr
    13 // Last Modified On : Fri Apr 27 08:55:31 2018
    14 // Update Count     : 19
     12// Last Modified On : Sat Aug 18 11:21:58 2018
     13// Update Count     : 24
    1514//
    1615
    17 #include <fstream>
    18 #include <coroutine>
     16#include <fstream.hfa>
     17#include <coroutine.hfa>
    1918
    2019coroutine Fibonacci { int fn; };                                                // used for communication
    … …  
    2625        fn = 1;  fn2 = fn1;  fn1 = fn;                                          // 2nd case
    2726        suspend();                                                                                      // restart last resume
    28         for ( ;; ) {
     27        for () {
    2928                fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;                  // general case
    3029                suspend();                                                                              // restart last resume
    … …  
    3938int main() {
    4039        Fibonacci f1, f2;
    41         for ( int i = 1; i <= 10; i += 1 ) {
     40        for ( 10 ) {                                                                            // print N Fibonacci values
    4241                sout | next( f1 ) | next( f2 ) | endl;
    4342        } // for

  • tests/coroutine/fmtLines.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
     6//
    77// fmtLines.cc -- format characters into blocks of 4 and groups of 5 blocks per line
    8 // 
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Sun Sep 17 21:56:15 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue May 15 12:25:33 2018
    13 // Update Count     : 42
    14 // 
     12// Last Modified On : Thu Aug 16 08:20:54 2018
     13// Update Count     : 45
     14//
    1515
    16 #include <fstream>
    17 #include <coroutine>
     16#include <fstream.hfa>
     17#include <coroutine.hfa>
    1818
    1919coroutine Format {
    … …  
    2323
    2424void main( Format & fmt ) with( fmt ) {
    25         for ( ;; ) {                                                                            // for as many characters
    26                 for ( g = 0; g < 5; g += 1 ) {                                  // groups of 5 blocks
    27                         for ( b = 0; b < 4; b += 1 ) {                          // blocks of 4 characters
    28                                 for ( ;; ) {                                                    // for newline characters
     25        for () {                                                                                        // for as many characters
     26                for ( g; 5 ) {                                                                  // groups of 5 blocks
     27                        for ( b; 4 ) {                                                          // blocks of 4 characters
     28                                for () {                                                                // for newline characters
    2929                                        suspend();
    3030                                        if ( ch != '\n' ) break;                        // ignore newline
    … …  
    5353        Format fmt;
    5454
    55         eof: for ( ;; ) {                                                                       // read until end of file
     55  eof: for () {                                                                                 // read until end of file
    5656                sin | fmt.ch;                                                                   // read one character
    5757          if ( eof( sin ) ) break eof;                                          // eof ?

  • tests/coroutine/pingpong.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // pingpong.c -- 
    8 // 
     6//
     7// pingpong.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed Sep 20 11:55:23 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Sep 20 13:41:39 2017
    13 // Update Count     : 26
    14 // 
     12// Last Modified On : Sat Aug 18 11:31:11 2018
     13// Update Count     : 28
     14//
    1515
    16 #include <coroutine>
    17 #include <fstream>
     16#include <coroutine.hfa>
     17#include <fstream.hfa>
    1818
    1919coroutine PingPong {
    … …  
    3939}
    4040void main( PingPong & pingpong ) {                                              // ping's starter ::main, pong's starter ping
    41         for ( unsigned int i = 0; i < pingpong.N; i += 1 ) {
     41        for ( pingpong.N ) {                                                            // N ping-pongs
    4242                sout | pingpong.name | endl;
    4343                cycle( *pingpong.part );

  • tests/coroutine/prodcons.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // prodcons.c -- 
    8 // 
     6//
     7// prodcons.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Mon Sep 18 12:23:39 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Jan  2 12:17:01 2018
    13 // Update Count     : 47
    14 // 
     12// Last Modified On : Sat Aug 18 12:55:10 2018
     13// Update Count     : 51
     14//
    1515
    16 #include <fstream>
    17 #include <coroutine>
    18 #include <stdlib>                                                                               // random
     16#include <fstream.hfa>
     17#include <coroutine.hfa>
     18#include <stdlib.hfa>                                                                   // random
    1919#include <unistd.h>                                                                             // getpid
    2020
    … …  
    2929void main( Prod & prod ) with( prod ) {                                 // starter ::main
    3030        // 1st resume starts here
    31         for ( int i = 0; i < N; i += 1 ) {
     31        for ( i; N ) {                                                                          // N pairs of values
    3232                int p1 = random( 100 );
    3333                int p2 = random( 100 );

  • tests/coroutine/runningTotal.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // runningTotal.c -- 
    8 // 
     6//
     7// runningTotal.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed Dec  6 08:05:27 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Dec  6 08:09:24 2017
    13 // Update Count     : 2
    14 // 
     12// Last Modified On : Thu Aug 16 08:22:29 2018
     13// Update Count     : 3
     14//
    1515
    16 #include <fstream>
    17 #include <coroutine>
     16#include <fstream.hfa>
     17#include <coroutine.hfa>
    1818
    1919coroutine RunTotal {                                                                    // input numbers and return running total
    … …  
    2929
    3030void main( RunTotal & rntl ) with( rntl ) {
    31         for ( ;; ) {
     31        for () {
    3232                update( rntl, input );
    3333        } // for
    … …  
    4141int main() {
    4242        RunTotal rntl;
    43         for ( int i = 0; i < 10; i += 1 ) {
     43        for ( i; 10 ) {
    4444                sout | i | add( rntl, i ) | endl;
    4545        } // for

  • tests/div.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // div.c -- 
    8 // 
     6//
     7// div.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Tue Aug  8 16:28:43 2017
    … …  
    1212// Last Modified On : Thu Dec  7 09:06:52 2017
    1313// Update Count     : 18
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <stdlib>                                                                               // div
     16#include <fstream.hfa>
     17#include <stdlib.hfa>                                                                           // div
    1818
    1919struct T { int i; };

  • tests/except-2.c

    r2b79a70 rcdbab55  
    22
    33
    4 #include <stdlib>
     4#include <stdlib.hfa>
    55#include "except-mac.h"
    66

  • tests/fallthrough.c

    r2b79a70 rcdbab55  
    1010// Created On       : Wed Mar 14 10:06:25 2018
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Mar 14 22:45:13 2018
    13 // Update Count     : 13
     12// Last Modified On : Thu Aug 16 08:21:46 2018
     13// Update Count     : 14
    1414//
    1515
    … …  
    9292        choose ( 3 ) {
    9393                case 2:
    94                         for ( ;; ) {
     94                        for () {
    9595                                choose ( 2 ) {
    9696                                        case 1:

  • tests/fstream_test.c

    r2b79a70 rcdbab55  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // fstream_test.c -- 
     7// fstream_test.c --
    88//
    99// Author           : Peter A. Buhr
    … …  
    1414//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818int main( void ) {

  • tests/function-operator.c

    r2b79a70 rcdbab55  
    1010// Created On       : Fri Aug 25 15:21:11 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Dec  7 12:42:26 2017
    13 // Update Count     : 6
     12// Last Modified On : Thu Aug  2 09:27:53 2018
     13// Update Count     : 8
    1414//
    1515
    16 #include <fstream>
    17 #include <stdlib>
     16#include <fstream.hfa>
     17#include <stdlib.hfa>
    1818
    1919#define length(array) (sizeof((array))/sizeof((array)[0]))
    … …  
    9292void ?{}(ostream_iterator & iter, ofstream * out) {
    9393        iter.out = new(out);
    94                 }
     94}
    9595// no destructor, memory leak. This is necessary for this to work at the moment, since
    9696// *? requires its parameter by value and returns a reference.
    … …  
    168168        transform(begin(x), end(x), begin(x), &times2);
    169169        copy(begin(x), end(x), out_iter);
     170
     171        // REMOVE WHEN ?* PROBLEM FIXED.
     172        delete(out_iter.out);
    170173}
    171174

  • tests/genericUnion.c

    r2b79a70 rcdbab55  
    1 #include <limits>
     1#include <limits.hfa>
    22
    33forall(otype T)

  • tests/gmp.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // gmp.c -- 
    8 // 
     6//
     7// gmp.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Tue Apr 19 08:55:51 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Sep 28 18:33:51 2017
    13 // Update Count     : 555
    14 // 
     12// Last Modified On : Sat Aug 18 12:43:13 2018
     13// Update Count     : 556
     14//
    1515
    1616// NOTE: UBUNTU DOES NOT SUPPORT GMP MULTILIB, SO ONLY 64-BIT GMP IS TESTED.
    1717
    18 #include <gmp>
     18#include <gmp.hfa>
    1919
    2020int main( void ) {
    … …  
    8989        fn = 1; fn2 = fn1; fn1 = fn;                                            // 2nd case
    9090        sout | 1 | fn | endl;
    91         for ( unsigned int i = 2; i <= 200; i += 1 ) {
     91        for ( i; 2u ~= 200 ) {
    9292                fn = fn1 + fn2; fn2 = fn1; fn1 = fn;                    // general case
    9393                sout | i | fn | endl;
    … …  
    9999        Int fact = 1;                                                                           // 1st case
    100100        sout | (int)0 | fact | endl;
    101         for ( unsigned int i = 1; i <= 40; i += 1 ) {
     101        for ( i; 1u ~= 40u ) {
    102102                fact *= i;                                                                              // general case
    103103                sout | i | fact | endl;

  • tests/heap.c

    r2b79a70 rcdbab55  
    1 #include <thread>
    2 #include <kernel>                                                                               // processor
    3 #include <stdlib>                                                                               // *allocs
     1#include <thread.hfa>
     2#include <kernel.hfa>                                                                           // processor
     3#include <stdlib.hfa>                                                                           // *allocs
    44#include <malloc.h>                                                                             // malloc_*
    55
    6 // #include <time>
     6// #include <time.hfa>
    77// #define __CFA_DEFAULT_PREEMPTION__ 1000`us
    88// //#define __CFA_DEFAULT_PREEMPTION__ 0

  • tests/hello.c

    r2b79a70 rcdbab55  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // hello.c -- 
     7// hello.c --
    88//
    99// Author           : Peter A. Buhr
    … …  
    1414//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818int main() {

  • tests/identity.c

    r2b79a70 rcdbab55  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // identity.c -- 
     7// identity.c --
    88//
    99// Author           : Peter A. Buhr
    … …  
    1414//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818forall( otype T )

  • tests/ifwhileCtl.c

    r2b79a70 rcdbab55  
    1414//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818int f( int r ) { return r; }

  • tests/io1.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // io1.c -- 
    8 // 
     6//
     7// io1.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed Mar  2 16:56:02 2016
    … …  
    1212// Last Modified On : Thu May 24 21:17:56 2018
    1313// Update Count     : 104
    14 // 
     14//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818int main() {

  • tests/io2.c

    r2b79a70 rcdbab55  
    1414//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818 #define xstr(s) str(s)

  • tests/labelledExit.c

    r2b79a70 rcdbab55  
    1010// Created On       : Wed Aug 10 07:29:39 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Aug 10 07:30:15 2016
    13 // Update Count     : 1
     12// Last Modified On : Thu Aug 16 08:55:39 2018
     13// Update Count     : 3
    1414//
    1515
    … …  
    6060        }
    6161
    62   D: for ( ;; ) {
     62  D: for () {
    6363                break D;
    6464                continue D;
    … …  
    6767  Z : i += 1;
    6868        goto Z;
    69   X: Y: for ( ;; ) {
     69  X: Y: for () {
    7070                i += 1;
    7171                if ( i > 5 ) continue X;
    … …  
    7474                break;
    7575        }
    76   XX: for ( ;; ) {
    77           YY: for ( ;; ) {
    78                   ZZ: for ( ;; ) {
     76  XX: for () {
     77          YY: for () {
     78                  ZZ: for () {
    7979                                i += 1;
    8080                                if ( i > 5 ) continue XX;
    … …  
    8989        }
    9090
    91         for ( ;; ) ;
     91        for () ;
    9292        for ( int i = 0 ;; ) ;
    9393        for (  ; i < 0; ) ;
    … …  
    9797  L20: L21: L22: L23: L24: L25: L26: L27: L28: L29:
    9898  L31: L32: L33: L34:
    99         for ( ;; ) {
     99        for () {
    100100                break L0;
    101101        }

  • tests/limits.c

    r2b79a70 rcdbab55  
    1414//
    1515
    16 #include <limits>
     16#include <limits.hfa>
    1717
    1818// Integral Constants

  • tests/literals.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // literals.c -- 
    8 // 
     6//
     7// literals.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Sat Sep  9 16:34:38 2017
    … …  
    1212// Last Modified On : Sun Jul  1 15:12:15 2018
    1313// Update Count     : 137
    14 // 
     14//
    1515
    1616#ifdef __CFA__
    1717#include <stdint.h>
    18 #include <fstream>
     18#include <fstream.hfa>
    1919
    2020void f( char v ) { sout | "char " | v | endl; }
    … …  
    221221        -0123456789.0123456789E+09L32;  -0123456789.0123456789E+09L64;  -0123456789.0123456789E+09L80;  -0123456789.0123456789E+09L128;
    222222         0123456789.0123456789E-09L32;   0123456789.0123456789E-09L64;   0123456789.0123456789E-09L80;   0123456789.0123456789E-09L128;
    223        
     223
    224224         0x0123456789.p09l32;   0x0123456789.p09l64;   0x0123456789.p09l80;   0x0123456789.p09l128;
    225225        +0x0123456789.p09l32;  +0x0123456789.p09l64;  +0x0123456789.p09l80;  +0x0123456789.p09l128;

  • tests/math1.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // math1.c -- 
    8 // 
     6//
     7// math1.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Fri Apr 22 14:59:21 2016
    … …  
    1212// Last Modified On : Thu May 24 21:01:15 2018
    1313// Update Count     : 85
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <math>
     16#include <fstream.hfa>
     17#include <math.hfa>
    1818
    1919int main( void ) {
    … …  
    4141        sout | "exp2:" | exp2( 1.0F ) | exp2( 1.0D ) | exp2( 1.0L ) | endl;
    4242        sout | "expm1:" | expm1( 1.0F ) | expm1( 1.0D ) | expm1( 1.0L ) | endl;
    43         sout | "pow:" | pow( 1.0F, 1.0F ) | pow( 1.0D, 1.0D ) | pow( 1.0L, 1.0L ) | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.0DL+1.0LI, 1.0DL+1.0LI ) | endl;
     43        sout | "pow:" | pow( 1.0F, 1.0F ) | pow( 1.0D, 1.0D ) | pow( 1.0L, 1.0L ) | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.5DL+1.5LI, 1.5DL+1.5LI ) | endl;
    4444
    4545        int b = 4;

  • tests/math2.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // math2.c -- 
    8 // 
     6//
     7// math2.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Fri Apr 22 14:59:21 2016
    … …  
    1212// Last Modified On : Thu May 24 21:06:10 2018
    1313// Update Count     : 82
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <math>
     16#include <fstream.hfa>
     17#include <math.hfa>
    1818
    1919int main( void ) {

  • tests/math3.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // math3.c -- 
    8 // 
     6//
     7// math3.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Fri Apr 22 14:59:21 2016
    … …  
    1212// Last Modified On : Thu May 24 21:06:12 2018
    1313// Update Count     : 82
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <math>
     16#include <fstream.hfa>
     17#include <math.hfa>
    1818
    1919int main( void ) {

  • tests/math4.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // math4.c -- 
    8 // 
     6//
     7// math4.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Thu May 24 20:56:54 2018
    … …  
    1212// Last Modified On : Thu May 24 20:58:06 2018
    1313// Update Count     : 2
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <math>
     16#include <fstream.hfa>
     17#include <math.hfa>
    1818
    1919int main( void ) {

  • tests/maybe.c

    r2b79a70 rcdbab55  
    1515
    1616#include <assert.h>
    17 #include <containers/maybe>
     17#include <containers/maybe.hfa>
    1818
    1919void checkPredicates() {

  • tests/minmax.c

    r2b79a70 rcdbab55  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // minmax.c -- 
     7// minmax.c --
    88//
    99// Author           : Peter A. Buhr
    … …  
    1414//
    1515
    16 #include <fstream>
    17 #include <stdlib>                                                                               // min, max
     16#include <fstream.hfa>
     17#include <stdlib.hfa>                                                                           // min, max
    1818
    1919int main( void ) {

  • tests/preempt_longrun/Makefile.am

    r2b79a70 rcdbab55  
    1414## Update Count     : 0
    1515###############################################################################
     16
     17AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    1618
    1719repeats=10

  • tests/preempt_longrun/Makefile.in

    r2b79a70 rcdbab55  
    9191build_triplet = @build@
    9292host_triplet = @host@
    93 subdir = src/tests/preempt_longrun
     93subdir = tests/preempt_longrun
    9494ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    95 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     95am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     96        $(top_srcdir)/configure.ac
    9697am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9798        $(ACLOCAL_M4)
    … …  
    338339BACKEND_CC = @BACKEND_CC@
    339340BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    340 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    341341CC = @CFACC@
    342342CCAS = @CCAS@
    … …  
    369369EXEEXT = @EXEEXT@
    370370GREP = @GREP@
     371HOST_FLAGS = @HOST_FLAGS@
    371372INSTALL = @INSTALL@
    372373INSTALL_DATA = @INSTALL_DATA@
    … …  
    378379LEXLIB = @LEXLIB@
    379380LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     381LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     382LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    380383LIBOBJS = @LIBOBJS@
    381384LIBS = @LIBS@
    382385LTLIBOBJS = @LTLIBOBJS@
    383 MACHINE_TYPE = @MACHINE_TYPE@
    384386MAKEINFO = @MAKEINFO@
    385387MKDIR_P = @MKDIR_P@
    … …  
    397399SHELL = @SHELL@
    398400STRIP = @STRIP@
     401TARGET_HOSTS = @TARGET_HOSTS@
    399402VERSION = @VERSION@
    400403YACC = @YACC@
    … …  
    452455top_builddir = @top_builddir@
    453456top_srcdir = @top_srcdir@
     457AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    454458repeats = 10
    455459max_time = 600
    … …  
    479483          esac; \
    480484        done; \
    481         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/preempt_longrun/Makefile'; \
     485        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/preempt_longrun/Makefile'; \
    482486        $(am__cd) $(top_srcdir) && \
    483           $(AUTOMAKE) --foreign src/tests/preempt_longrun/Makefile
     487          $(AUTOMAKE) --foreign tests/preempt_longrun/Makefile
    484488Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    485489        @case '$?' in \

  • tests/preempt_longrun/create.c

    r2b79a70 rcdbab55  
    1 #include <kernel>
    2 #include <thread>
    3 #include <time>
     1#include <kernel.hfa>
     2#include <thread.hfa>
     3#include <time.hfa>
    44
    55#include "long_tests.h"

  • tests/preempt_longrun/enter.c

    r2b79a70 rcdbab55  
    1 #include <kernel>
    2 #include <monitor>
    3 #include <thread>
    4 #include <time>
     1#include <kernel.hfa>
     2#include <monitor.hfa>
     3#include <thread.hfa>
     4#include <time.hfa>
    55
    66#define __kick_rate 75000ul

  • tests/preempt_longrun/enter3.c

    r2b79a70 rcdbab55  
    1 #include <kernel>
    2 #include <monitor>
    3 #include <thread>
    4 #include <time>
     1#include <kernel.hfa>
     2#include <monitor.hfa>
     3#include <thread.hfa>
     4#include <time.hfa>
    55
    66#define __kick_rate 75000ul

  • tests/preempt_longrun/processor.c

    r2b79a70 rcdbab55  
    1 #include <kernel>
    2 #include <thread>
    3 #include <time>
     1#include <kernel.hfa>
     2#include <thread.hfa>
     3#include <time.hfa>
    44
    55#include <unistd.h>

  • tests/preempt_longrun/stack.c

    r2b79a70 rcdbab55  
    1 #include <kernel>
    2 #include <math>
    3 #include <thread>
    4 #include <time>
     1#include <kernel.hfa>
     2#include <math.hfa>
     3#include <thread.hfa>
     4#include <time.hfa>
    55
    66#define __kick_rate 5000000ul

  • tests/preempt_longrun/yield.c

    r2b79a70 rcdbab55  
    1 #include <kernel>
    2 #include <thread>
    3 #include <time>
     1#include <kernel.hfa>
     2#include <thread.hfa>
     3#include <time.hfa>
    44
    55#define __kick_rate 550000ul

  • tests/pybin/tools.py

    r2b79a70 rcdbab55  
    3636
    3737def is_ascii(fname):
     38        if settings.dry_run:
     39                print("is_ascii: %s" % fname)
     40                return True
     41
    3842        if not os.path.isfile(fname):
    3943                return False
    … …  
    5256# Remove 1 or more files silently
    5357def rm( files ):
    54         try:
     58        if isinstance( files, basestring ):
     59                sh("rm -f %s > /dev/null 2>&1" % files )
     60        else:
    5561                for file in files:
    5662                        sh("rm -f %s > /dev/null 2>&1" % file )
    57         except TypeError:
    58                 sh("rm -f %s > /dev/null 2>&1" % files )
    5963
    6064# Create 1 or more directory
    6165def mkdir( files ):
    62         try:
     66        if isinstance( files, basestring ):
     67                sh("mkdir -p %s" % os.path.dirname(files) )
     68        else:
    6369                for file in files:
    6470                        sh("mkdir -p %s" % os.path.dirname(file) )
    65         except TypeError:
    66                 sh("mkdir -p %s" % os.path.dirname(files) )
     71
    6772
    6873def chdir( dest = __main__.__file__ ):
    … …  
    7479def diff( lhs, rhs ):
    7580        # diff the output of the files
    76         diff_cmd = ("diff --ignore-all-space "
     81        diff_cmd = ("diff --ignore-all-space --text "
    7782                                "--ignore-blank-lines "
    7883                                "--old-group-format='\t\tmissing lines :\n"
    … …  
    100105                '-s' if silent else '',
    101106                test_param,
     107                settings.arch.flags,
    102108                settings.debug.flags,
     109                settings.install.flags,
    103110                flags,
    104111                target,
    … …  
    129136# helper function to replace patterns in a file
    130137def file_replace(fname, pat, s_after):
     138        if settings.dry_run:
     139                print("replacing '%s' with '%s' in %s" % (pat, s_after, fname))
     140                return
     141
    131142        file = fileinput.FileInput(fname, inplace=True, backup='.bak')
    132143        for line in file:

  • tests/quoted_keyword.c

    r2b79a70 rcdbab55  
    1414//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818struct {

  • tests/raii/.expect/dtor-early-exit-ERR1.txt

    r2b79a70 rcdbab55  
    1 raii/dtor-early-exit.c:153:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
     1raii/dtor-early-exit.c:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
    22  with target: L1
    33  with original target: L1

  • tests/raii/.expect/dtor-early-exit-ERR2.txt

    r2b79a70 rcdbab55  
    1 raii/dtor-early-exit.c:217:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
     1raii/dtor-early-exit.c:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
    22  with target: L2
    33  with original target: L2

  • tests/raii/dtor-early-exit.c

    r2b79a70 rcdbab55  
    1010// Created On       : Wed Aug 17 08:26:25 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Aug 17 08:29:37 2016
    13 // Update Count     : 2
    14 //
    15 
    16 #include <fstream>
    17 #include <stdlib>
    18 extern "C" {
    19 #define false ((int)0)  // until stdbool.h works
    20 #define assert(cond) if (! (cond)) { sout | "Assertion failed: (" | #cond | ") at " __FILE__ | ":" | __LINE__ | endl; abort(); }
    21 }
     12// Last Modified On : Sat Aug 11 07:58:39 2018
     13// Update Count     : 8
     14//
     15
     16#include <fstream.hfa>
     17#include <stdlib.hfa>
     18#include <assert.h>
    2219
    2320struct A {

  • tests/raii/globals.c

    r2b79a70 rcdbab55  
    1 #include <fstream>
     1#include <fstream.hfa>
    22
    33struct value_t {

  • tests/random.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // random.c -- 
    8 // 
     6//
     7// random.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Tue Jul  5 21:29:30 2016
    … …  
    1212// Last Modified On : Tue Jan  2 12:19:34 2018
    1313// Update Count     : 19
    14 // 
     14//
    1515
    16 #include <fstream>
    17 #include <stdlib>                                                                               // random
     16#include <fstream.hfa>
     17#include <stdlib.hfa>                                                                           // random
    1818#include <unistd.h>                                                                             // getpid
    1919

  • tests/rational.c

    r2b79a70 rcdbab55  
    1414//
    1515
    16 #include <rational>
    17 #include <limits>
    18 #include <stdlib>
    19 #include <fstream>
     16#include <rational.hfa>
     17#include <limits.hfa>
     18#include <stdlib.hfa>
     19#include <fstream.hfa>
    2020
    2121// UNNECESSARY, FIX ME

  • tests/result.c

    r2b79a70 rcdbab55  
    1515
    1616#include <assert.h>
    17 #include <containers/result>
     17#include <containers/result.hfa>
    1818
    1919void checkPredicates() {

  • tests/searchsort.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // searchsort.c -- 
    8 // 
     6//
     7// searchsort.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Thu Feb  4 18:17:50 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Jan  2 08:01:17 2018
    13 // Update Count     : 100
    14 // 
     12// Last Modified On : Thu Aug  9 07:54:57 2018
     13// Update Count     : 101
     14//
    1515
    16 #include <fstream>
    17 #include <stdlib>                                                                               // bsearch, qsort
     16#include <fstream.hfa>
     17#include <stdlib.hfa>                                                                           // bsearch, qsort
    1818#include <stdlib.h>                                                                             // C version of bsearch
    1919
    … …  
    2424        int iarr[size];
    2525
    26         for ( unsigned int i = 0; i < size; i += 1 ) {
     26        for ( i; 0u ~ size ) {
    2727                iarr[i] = size - i;
    2828                sout | iarr[i] | ", ";
    … …  
    3232        // ascending sort/search by changing < to >
    3333        qsort( iarr, size );
    34         for ( unsigned int i = 0; i < size; i += 1 ) {
     34        for ( i; 0u ~ size ) {
    3535                sout | iarr[i] | ", ";
    3636        } // for
    3737        sout | endl;
    38         for ( unsigned int i = 0; i < size; i += 1 ) {          // C version
     38        for ( i; 0u ~ size ) {          // C version
    3939                int key = size - i;
    4040                int * v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
    … …  
    4343        sout | endl;
    4444
    45         for ( unsigned int i = 0; i < size; i += 1 ) {
     45        for ( i; 0u ~ size ) {
    4646                int * v = bsearch( size - i, iarr, size );
    4747                sout | size - i | ':' | *v | ", ";
    4848        } // for
    4949        sout | endl;
    50         for ( unsigned int i = 0; i < size; i += 1 ) {
     50        for ( i; 0u ~ size ) {
    5151                unsigned int posn = bsearch( size - i, iarr, size );
    5252                sout | size - i | ':' | iarr[posn] | ", ";
    … …  
    5555
    5656        // descending sort/search by changing < to >
    57         for ( unsigned int i = 0; i < size; i += 1 ) {
     57        for ( i; 0u ~ size ) {
    5858                iarr[i] = i + 1;
    5959                sout | iarr[i] | ", ";
    … …  
    6363                int ?<?( int x, int y ) { return x > y; }
    6464                qsort( iarr, size );
    65                 for ( unsigned int i = 0; i < size; i += 1 ) {
     65                for ( i; 0u ~ size ) {
    6666                        sout | iarr[i] | ", ";
    6767                } // for
    6868                sout | endl;
    69                 for ( unsigned int i = 0; i < size; i += 1 ) {
     69                for ( i; 0u ~ size ) {
    7070                        int * v = bsearch( size - i, iarr, size );
    7171                        sout | size - i | ':' | *v | ", ";
    7272                } // for
    7373                sout | endl;
    74                 for ( unsigned int i = 0; i < size; i += 1 ) {
     74                for ( i; 0u ~ size ) {
    7575                        unsigned int posn = bsearch( size - i, iarr, size );
    7676                        sout | size - i | ':' | iarr[posn] | ", ";
    … …  
    8080
    8181        double darr[size];
    82         for ( unsigned int i = 0; i < size; i += 1 ) {
     82        for ( i; 0u ~ size ) {
    8383                darr[i] = size - i + 0.5;
    8484                sout | darr[i] | ", ";
    … …  
    8686        sout | endl;
    8787        qsort( darr, size );
    88         for ( unsigned int i = 0; i < size; i += 1 ) {
     88        for ( i; 0u ~ size ) {
    8989                sout | darr[i] | ", ";
    9090        } // for
    9191        sout | endl;
    92         for ( unsigned int i = 0; i < size; i += 1 ) {
     92        for ( i; 0u ~ size ) {
    9393                double * v = bsearch( size - i + 0.5, darr, size );
    9494                sout | size - i + 0.5 | ':' | *v | ", ";
    9595        } // for
    9696        sout | endl;
    97         for ( unsigned int i = 0; i < size; i += 1 ) {
     97        for ( i; 0u ~ size ) {
    9898                unsigned int posn = bsearch( size - i + 0.5, darr, size );
    9999                sout | size - i + 0.5 | ':' | darr[posn] | ", ";
    … …  
    104104        int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
    105105        ofstream & ?|?( ofstream & os, S v ) { return os | v.i | ' ' | v.j; }
    106         for ( unsigned int i = 0; i < size; i += 1 ) {
     106        for ( i; 0u ~ size ) {
    107107                sarr[i].i = size - i;
    108108                sarr[i].j = size - i + 1;
    … …  
    111111        sout | endl;
    112112        qsort( sarr, size );
    113         for ( unsigned int i = 0; i < size; i += 1 ) {
     113        for ( i; 0u ~ size ) {
    114114                sout | sarr[i] | ", ";
    115115        } // for
    116116        sout | endl;
    117         for ( unsigned int i = 0; i < size; i += 1 ) {
     117        for ( i; 0u ~ size ) {
    118118                S temp = { size - i, size - i + 1 };
    119119                S * v = bsearch( temp, sarr, size );
    … …  
    121121        } // for
    122122        sout | endl;
    123         for ( unsigned int i = 0; i < size; i += 1 ) {
     123        for ( i; 0u ~ size ) {
    124124                S temp = { size - i, size - i + 1 };
    125125                unsigned int posn = bsearch( temp, sarr, size );
    … …  
    129129        {
    130130                unsigned int getKey( const S & s ) { return s.j; }
    131                 for ( unsigned int i = 0; i < size; i += 1 ) {
     131                for ( i; 0u ~ size ) {
    132132                        sout | sarr[i] | ", ";
    133133                } // for
    134134                sout | endl;
    135                 for ( unsigned int i = 0; i < size; i += 1 ) {
     135                for ( i; 0u ~ size ) {
    136136                        S * v = bsearch( size - i + 1, sarr, size );
    137137                        sout | size - i + 1 | ':' | *v | ", ";
    138138                } // for
    139139                sout | endl;
    140                 for ( unsigned int i = 0; i < size; i += 1 ) {
     140                for ( i; 0u ~ size ) {
    141141                        unsigned int posn = bsearch( size - i + 1, sarr, size );
    142142                        sout | size - i + 1 | ':' | sarr[posn] | ", ";

  • tests/shortCircuit.c

    r2b79a70 rcdbab55  
    2222}
    2323
    24 #include <fstream>
     24#include <fstream.hfa>
    2525
    2626struct test_t {

  • tests/sum.c

    r2b79a70 rcdbab55  
    1111// Created On       : Wed May 27 17:56:53 2015
    1212// Last Modified By : Peter A. Buhr
    13 // Last Modified On : Sun Jun  3 19:23:41 2018
    14 // Update Count     : 278
     13// Last Modified On : Thu Aug  2 08:03:09 2018
     14// Update Count     : 279
    1515//
    1616
    17 #include <fstream>
    18 #include <stdlib>
     17#include <fstream.hfa>
     18#include <stdlib.hfa>
    1919
    2020void ?{}( int & c, zero_t ) { c = 0; }                                  // not in prelude
    … …  
    115115        sout | "sum from" | low | "to" | High | "is"
    116116                 | sum( size, gs.x ) | ", check" | (int)s | endl; // add field array in generic type
     117        delete( gs.x );
    117118} // main
    118119

  • tests/swap.c

    r2b79a70 rcdbab55  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // swap.c -- 
     7// swap.c --
    88//
    99// Author           : Peter A. Buhr
    … …  
    1414//
    1515
    16 #include <fstream>
    17 #include <stdlib>                                                                               // swap
     16#include <fstream.hfa>
     17#include <stdlib.hfa>                                                                           // swap
    1818
    1919int main( void ) {

  • tests/test.py

    r2b79a70 rcdbab55  
    8585        # create a parser with the arguments for the tests script
    8686        parser = argparse.ArgumentParser(description='Script which runs cforall tests')
    87         parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='no')
     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')
    8889        parser.add_argument('--arch', help='Test for specific architecture', type=str, default='')
     90        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
     91        parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
    8992        parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
    9093        parser.add_argument('--list', help='List all test available', action='store_true')
    … …  
    97100        parser.add_argument('tests', metavar='test', type=str, nargs='*', help='a list of tests to run')
    98101
    99         options =  parser.parse_args()
     102        try:
     103                options =  parser.parse_args()
     104        except:
     105                print('ERROR: invalid arguments', file=sys.stderr)
     106                parser.print_help(sys.stderr)
     107                sys.exit(1)
    100108
    101109        # script must have at least some tests to run or be listing
    … …  
    154162                if settings.dry_run or fileIsExecutable(exe_file) :
    155163                        # run test
    156                         retcode, _ = sh("timeout 60 %s > %s 2>&1" % (exe_file, out_file), input = in_file)
     164                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
    157165                else :
    158166                        # simply cat the result into the output
    … …  
    166174
    167175        if retcode == 0:
     176                # fixoutput(out_file)
    168177                if settings.generating :
    169178                        # if we are ounly generating the output we still need to check that the test actually exists
    … …  
    176185                else :
    177186                        # fetch return code and error from the diff command
    178                         fixoutput(out_file)
    179187                        retcode, error = diff(cmp_file, out_file)
    180188
    … …  
    228236                        tests,
    229237                        chunksize = 1
    230                 ).get(7200)
     238                ).get(settings.timeout.total)
    231239        except KeyboardInterrupt:
    232240                pool.terminate()
    … …  
    277285        # users may want to simply list the tests
    278286        if options.list_comp :
    279                 print("-h --help --debug --dry-run --list --arch --all --regenerate-expected -j --jobs ", end='')
     287                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --install --timeout --global-timeout -j --jobs ", end='')
    280288                print(" ".join(map(lambda t: "%s" % (t.target()), tests)))
    281289
    … …  
    285293
    286294        else :
     295                # check the build configuration works
     296                settings.validate()
     297
    287298                options.jobs, forceJobs = jobCount( options, tests )
    288299                settings.updateMakeCmd(forceJobs, options.jobs)

  • tests/time.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // time.c -- 
    8 // 
     6//
     7// time.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Tue Mar 27 17:24:56 2018
    … …  
    1212// Last Modified On : Fri Apr  6 11:27:23 2018
    1313// Update Count     : 16
    14 // 
     14//
    1515
    16 #include "time"
    17 #include <fstream>
     16#include "time.hfa"
     17#include <fstream.hfa>
    1818
    1919int main() {
    20         Duration d1 = 3`h, d2 = 2`s, d3 = 3.07`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
     20        Duration d1 = 3`h, d2 = 2`s, d3 = 3.375`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
    2121        sout | d1 | d2 | d3 | d4 | d5 | endl;
    2222        int i;

  • tests/tuple/tupleAssign.c

    r2b79a70 rcdbab55  
    1414//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717
    1818int main() {

  • tests/tuple/tupleVariadic.c

    r2b79a70 rcdbab55  
    99// Author           : Rob Schluntz
    1010// Created On       : Fri Dec 16 10:25:35 2016
    11 // Last Modified By : Rob Schluntz
    12 // Last Modified On : Fri Dec 21 14:42:48 2016
    13 // Update Count     : 2
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Thu Aug  2 09:24:04 2018
     13// Update Count     : 6
    1414//
     15
     16#include <stdlib.hfa>
    1517
    1618void func(void) {
    … …  
    2830        printf("called process(double) %g\n", x);
    2931}
    30 
    31 forall( dtype T, ttype Params | sized(T) | { void ?{}(T &, Params); } )
    32 T * new(Params p);
    3332
    3433struct array {
    … …  
    6665        a.data[2] = a2;
    6766        printf("called ?{} with a: %d %d %d\n", a0, a1, a2);
     67}
     68
     69void ^?{}(array & a) {
     70        free(a.data);
    6871}
    6972
    … …  
    126129                bar(x);
    127130        }
     131
     132        delete(ptr);
     133        delete(x4);
     134        delete(x3);
     135        delete(x2);
     136        delete(x1);
     137        delete(x0);
    128138}
    129139
    … …  
    131141// tab-width: 4 //
    132142// End: //
    133 

  • tests/user_literals.c

    r2b79a70 rcdbab55  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // user_literals.c -- 
    8 // 
     6//
     7// user_literals.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed Sep  6 21:40:50 2017
    … …  
    1212// Last Modified On : Sun Apr 29 16:51:42 2018
    1313// Update Count     : 54
    14 // 
     14//
    1515
    16 #include <fstream>
     16#include <fstream.hfa>
    1717#include <wchar.h>
    1818#include <uchar.h>

  • tests/vector.c

    r2b79a70 rcdbab55  
    1414//
    1515
    16 #include <fstream>
    17 #include <vector>
     16#include <fstream.hfa>
     17#include <vector.hfa>
    1818
    1919#undef assert

  • tests/virtualCast.c

    r2b79a70 rcdbab55  
    99 */
    1010
    11 #include <stdlib>
     11#include <stdlib.hfa>
    1212#include <assert.h>
    1313
Note: See TracChangeset for help on using the changeset viewer.