Changeset 794db28 for tests

Timestamp:

Aug 18, 2020, 11:35:50 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

93526ef

Parents:

d2b5d2d (diff), 36de20d (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:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/minmax.txt (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• alloc.cfa (modified) (3 diffs)
• exceptions/.expect/conditional-threads.txt (added)
• exceptions/.expect/defaults-threads.txt (added)
• exceptions/.expect/finally-threads.txt (added)
• exceptions/.expect/resume-threads.txt (added)
• exceptions/.expect/terminate-threads.txt (added)
• exceptions/terminate.cfa (modified) (1 diff)
• exceptions/with-threads.hfa (added)
• heap.cfa (modified) (3 diffs)
• linking/.expect/exception-nothreads.txt (added)
• linking/.expect/exception-withthreads.txt (added)
• linking/exception-nothreads.cfa (added)
• linking/exception-withthreads.cfa (added)
• linking/withthreads.cfa (modified) (1 diff)
• minmax.cfa (modified) (3 diffs)

tests/.expect/minmax.txt

@@ -1 +1 @@
 char                    z a     min a
-signed int              4 3     min 3
+signed int              4 -3    min -3
 unsigned int            4 3     min 3
-signed long int         4 3     min 3
+signed long int         4 -3    min -3
 unsigned long int       4 3     min 3
-signed long long int    4 3     min 3
+signed long long int    4 -3    min -3
 unsigned long long int  4 3     min 3
 float                   4. 3.1  min 3.1
@@ -11 +11 @@
 
 char                    z a     max z
-signed int              4 3     max 4
+signed int              4 -3    max 4
 unsigned int            4 3     max 4
-signed long int         4 3     max 4
+signed long int         4 -3    max 4
 unsigned long int       4 3     max 4
-signed long long int    4 3     max 4
+signed long long int    4 -3    max 4
 unsigned long long int  4 3     max 4
 float                   4. 3.1  max 4.

tests/Makefile.am

@@ -163 +163 @@
         $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
+# Exception Tests
+# Test with libcfathread; it changes how storage works.
+
+exceptions/%-threads : exceptions/%.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -include exceptions/with-threads.hfa -c -o $(abspath ${@}).o
+        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
+
 #------------------------------------------------------------------------------
 # Other targets

tests/alloc.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  6 21:08:23 2020
-// Update Count     : 428
+// Last Modified On : Fri Aug 14 16:59:59 2020
+// Update Count     : 430
 //
 
@@ -90 +90 @@
         // do not free
 
-        ip1 = alloc_set( 2 * dim, ip );                                         // CFA array alloc, fill
+        ip1 = alloc_set( 2 * dim, ip, 2 * dim );                                // CFA array alloc, fill
         printf( "CFA array alloc, fill from array\n" );
         for ( i; 2 * dim ) { printf( "%#x %#x, ", ip[i], ip1[i] ); }
@@ -288 +288 @@
         // do not free
 
-        stp1 = alloc_align_set( Alignment, dim, stp );          // CFA array memalign, fill
+        stp1 = alloc_align_set( Alignment, dim, stp, dim );     // CFA array memalign, fill
         assert( (uintptr_t)stp % Alignment == 0 );
         printf( "CFA array alloc_align, fill array\n" );

tests/exceptions/terminate.cfa

@@ -142 +142 @@
         }
 }
-

tests/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Nov  6 17:54:56 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug  4 06:36:17 2020
-// Update Count     : 56
+// Last Modified On : Sun Aug  9 08:05:16 2020
+// Update Count     : 57
 // 
 
@@ -232 +232 @@
                 size_t s = i + default_mmap_start();                    // cross over point
                 char * area = (char *)calloc( 1, s );
-//              if ( area == 0p ) abort( "calloc/realloc/free out of memory" );
                 if ( area[0] != '\0' || area[s - 1] != '\0' ||
                          area[malloc_size( area ) - 1] != '\0' ||
-                         ! malloc_zero_fill( area ) ) //abort( "calloc/realloc/free corrupt storage3" );
-                        printf( "C %zd %d %d %d %d\n", s, area[0] != '\0', area[s - 1] != '\0', area[malloc_size( area ) - 1] != '\0', ! malloc_zero_fill( area ) );
+                         ! malloc_zero_fill( area ) ) abort( "calloc/realloc/free corrupt storage3" );
 
                 // Do not start this loop index at 0 because realloc of 0 bytes frees the storage.
                 for ( r; i ~ 256 * 1024 ~ 26 ) {                                // start at initial memory request
                         area = (char *)realloc( area, r );                      // attempt to reuse storage
-//                      if ( area == 0p ) abort( "calloc/realloc/free out of memory" );
                         if ( area[0] != '\0' || area[r - 1] != '\0' ||
                                  area[malloc_size( area ) - 1] != '\0' ||
@@ -255 +252 @@
                 // initial N byte allocation
                 char * area = (char *)memalign( a, amount );    // aligned N-byte allocation
-//              if ( area == 0p ) abort( "memalign/realloc/free out of memory" ); // no storage ?
                 //sout | alignments[a] | area;
                 if ( (size_t)area % a != 0 || malloc_alignment( area ) != a ) { // check for initial alignment

tests/linking/withthreads.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// nothreads.cfa --
+// withthreads.cfa --
 //
 // Author           : Thierry Delisle

tests/minmax.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  4 21:45:31 2018
-// Update Count     : 52
+// Last Modified On : Sat Aug 15 08:28:01 2020
+// Update Count     : 54
 //
 
@@ -23 +23 @@
 
         sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' );
-        sout | "signed int\t\t"                         | 4 | 3 | "\tmin" | min( 4, 3 );
+        sout | "signed int\t\t"                         | 4 | -3 | "\tmin" | min( 4, -3 );
         sout | "unsigned int\t\t"                       | 4u | 3u | "\tmin" | min( 4u, 3u );
-        sout | "signed long int\t\t"            | 4l | 3l | "\tmin" | min( 4l, 3l );
+        sout | "signed long int\t\t"            | 4l | -3l | "\tmin" | min( 4l, -3l );
         sout | "unsigned long int\t"            | 4ul | 3ul | "\tmin" | min( 4ul, 3ul );
-        sout | "signed long long int\t"         | 4ll | 3ll | "\tmin" | min( 4ll, 3ll );
+        sout | "signed long long int\t"         | 4ll | -3ll | "\tmin" | min( 4ll, -3ll );
         sout | "unsigned long long int\t"       | 4ull | 3ull | "\tmin" | min( 4ull, 3ull );
         sout | "float\t\t\t"                            | 4.0f | 3.1f | "\tmin" | min( 4.0f, 3.1f );
@@ -36 +36 @@
 
         sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmax " | max( 'z', 'a' );
-        sout | "signed int\t\t"                         | 4 | 3 | "\tmax" | max( 4, 3 );
+        sout | "signed int\t\t"                         | 4 | -3 | "\tmax" | max( 4, -3 );
         sout | "unsigned int\t\t"                       | 4u | 3u | "\tmax" | max( 4u, 3u );
-        sout | "signed long int\t\t"            | 4l | 3l | "\tmax" | max( 4l, 3l );
+        sout | "signed long int\t\t"            | 4l | -3l | "\tmax" | max( 4l, -3l );
         sout | "unsigned long int\t"            | 4ul | 3ul | "\tmax" | max( 4ul, 3ul );
-        sout | "signed long long int\t"         | 4ll | 3ll | "\tmax" | max( 4ll, 3ll );
+        sout | "signed long long int\t"         | 4ll | -3ll | "\tmax" | max( 4ll, -3ll );
         sout | "unsigned long long int\t"       | 4ull | 3ull | "\tmax" | max( 4ull, 3ull );
         sout | "float\t\t\t"                            | 4.0f | 3.1f | "\tmax" | max( 4.0f, 3.1f );