Changeset 4d689e2

Timestamp:

Jan 10, 2024, 2:46:46 PM (15 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

8655363

Parents:

f0c9c9b (diff), cfbc56ec (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

Files:

• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/collections/array.hfa (modified) (2 diffs)
• libcfa/src/raii.hfa (added)
• tests/array-collections/.expect/array-raii-c.txt (added)
• tests/array-collections/.expect/array-raii-cfa.txt (added)
• tests/array-collections/array-raii-c.cfa (added)
• tests/array-collections/array-raii-cfa.cfa (added)
• tests/array-collections/array-raii.hfa (added)

libcfa/src/Makefile.am ¶

@@ -48 +48 @@
         math.trait.hfa \
         math.hfa \
+        raii.hfa \
         time_t.hfa \
         virtual_dtor.hfa \

libcfa/src/collections/array.hfa ¶

@@ -131 +131 @@
 
     static inline void __taglen( tag(arpk(N, S, Timmed, Tbase)), tag(N) ) {}
-
-    // workaround #226 (and array relevance thereof demonstrated in mike102/otype-slow-ndims.cfa)
-    static inline void ?{}( arpk(N, S, Timmed, Tbase) & this ) {
-        void ?{}( S (&inner)[N] ) {}
-        ?{}(this.strides);
-    }
-    static inline void ^?{}( arpk(N, S, Timmed, Tbase) & this ) {
-        void ^?{}( S (&inner)[N] ) {}
-        ^?{}(this.strides);
+}
+
+// RAII pattern has workarounds for
+//  - Trac 226:  Simplest handling would be, require immediate element to be otype, let autogen
+//    raii happen.  Performance on even a couple dimensions is unacceptable because of exponential
+//    thunk creation: ?{}() needs all four otype funcs from next level, so does ^?{}(), so do the
+//    other two.  This solution offers ?{}() that needs only ?{}(), and similar for ^?{}.
+
+forall( [N], S & | sized(S), Timmed &, Tbase & | { void ?{}( Timmed & ); } )
+static inline void ?{}( arpk(N, S, Timmed, Tbase) & this ) {    
+    void ?{}( S (&)[N] ) {}
+    ?{}(this.strides);
+
+    for (i; N) ?{}( (Timmed &) this.strides[i] );
+}
+
+forall( [N], S & | sized(S), Timmed &, Tbase & | { void ^?{}( Timmed & ); } )
+static inline void ^?{}( arpk(N, S, Timmed, Tbase) & this ) {
+    void ^?{}( S (&)[N] ) {}
+    ^?{}(this.strides);
+
+    for (i; N ) {
+        ^?{}( (Timmed &) this.strides[N-i-1] );
     }
 }
@@ -147 +161 @@
 //
 
-forall( Te )
+forall( Te * )
 static inline Te mkar_( tag(Te) ) {}