Changeset c84dd61 for libcfa/src/math.hfa

Timestamp:

Jun 21, 2023, 2:38:55 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

92355883

Parents:

0b0a285 (diff), 2de175ce (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

File:

• libcfa/src/math.hfa (modified) (3 diffs)

libcfa/src/math.hfa

@@ -10 +10 @@
 // Created On       : Mon Apr 18 23:37:04 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct  8 08:40:42 2022
-// Update Count     : 136
+// Last Modified On : Sun Jun 18 08:13:53 2023
+// Update Count     : 202
 //
 
@@ -236 +236 @@
 
         return (i << 32) + (sum);
-}
+} // log2_u32_32
 
 //---------------------- Trigonometric ----------------------
@@ -371 +371 @@
 
 inline __attribute__((always_inline)) static {
-        signed char floor( signed char n, signed char align ) { return n / align * align; }
-        unsigned char floor( unsigned char n, unsigned char align ) { return n / align * align; }
-        short int floor( short int n, short int align ) { return n / align * align; }
-        unsigned short int floor( unsigned short int n, unsigned short int align ) { return n / align * align; }
-        int floor( int n, int align ) { return n / align * align; }
-        unsigned int floor( unsigned int n, unsigned int align ) { return n / align * align; }
-        long int floor( long int n, long int align ) { return n / align * align; }
-        unsigned long int floor( unsigned long int n, unsigned long int align ) { return n / align * align; }
-        long long int floor( long long int n, long long int align ) { return n / align * align; }
-        unsigned long long int floor( unsigned long long int n, unsigned long long int align ) { return n / align * align; }
+        // force divide before multiply
+        signed char floor( signed char n, signed char align ) { return (n / align) * align; }
+        unsigned char floor( unsigned char n, unsigned char align ) { return (n / align) * align; }
+        short int floor( short int n, short int align ) { return (n / align) * align; }
+        unsigned short int floor( unsigned short int n, unsigned short int align ) { return (n / align) * align; }
+        int floor( int n, int align ) { return (n / align) * align; }
+        unsigned int floor( unsigned int n, unsigned int align ) { return (n / align) * align; }
+        long int floor( long int n, long int align ) { return (n / align) * align; }
+        unsigned long int floor( unsigned long int n, unsigned long int align ) { return (n / align) * align; }
+        long long int floor( long long int n, long long int align ) { return (n / align) * align; }
+        unsigned long long int floor( unsigned long long int n, unsigned long long int align ) { return (n / align) * align; }
 
         // forall( T | { T ?/?( T, T ); T ?*?( T, T ); } )
-        // T floor( T n, T align ) { return n / align * align; }
-
-        signed char ceiling_div( signed char n, char align ) { return (n + (align - 1)) / align; }
-        unsigned char ceiling_div( unsigned char n, unsigned char align ) { return (n + (align - 1)) / align; }
-        short int ceiling_div( short int n, short int align ) { return (n + (align - 1)) / align; }
-        unsigned short int ceiling_div( unsigned short int n, unsigned short int align ) { return (n + (align - 1)) / align; }
-        int ceiling_div( int n, int align ) { return (n + (align - 1)) / align; }
-        unsigned int ceiling_div( unsigned int n, unsigned int align ) { return (n + (align - 1)) / align; }
-        long int ceiling_div( long int n, long int align ) { return (n + (align - 1)) / align; }
-        unsigned long int ceiling_div( unsigned long int n, unsigned long int align ) { return (n + (align - 1)) / align; }
-        long long int ceiling_div( long long int n, long long int align ) { return (n + (align - 1)) / align; }
-        unsigned long long int ceiling_div( unsigned long long int n, unsigned long long int align ) { return (n + (align - 1)) / align; }
-
-        // forall( T | { T ?+?( T, T ); T ?-?( T, T ); T ?%?( T, T ); } )
-        // T ceiling_div( T n, T align ) { verify( is_pow2( align ) );return (n + (align - 1)) / align; }
-
-        // gcc notices the div/mod pair and saves both so only one div.
-        signed char ceiling( signed char n, signed char align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        unsigned char ceiling( unsigned char n, unsigned char align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        short int ceiling( short int n, short int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        unsigned short int ceiling( unsigned short int n, unsigned short int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        int ceiling( int n, int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        unsigned int ceiling( unsigned int n, unsigned int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        long int ceiling( long int n, long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        unsigned long int ceiling( unsigned long int n, unsigned long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0) , align); }
-        long long int ceiling( long long int n, long long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-        unsigned long long int ceiling( unsigned long long int n, unsigned long long int align ) { return floor( n + (n % align != 0 ? align - 1 : 0), align ); }
-
-        // forall( T | { void ?{}( T &, one_t ); T ?+?( T, T ); T ?-?( T, T ); T ?/?( T, T ); } )
-        // T ceiling( T n, T align ) { return return floor( n + (n % align != 0 ? align - 1 : 0), align ); *}
+        // T floor( T n, T align ) { return (n / align) * align; }
+
+        signed char ceiling_div( signed char n, char align ) { return (n + (align - 1hh)) / align; }
+        unsigned char ceiling_div( unsigned char n, unsigned char align ) { return (n + (align - 1hhu)) / align; }
+        short int ceiling_div( short int n, short int align ) { return (n + (align - 1h)) / align; }
+        unsigned short int ceiling_div( unsigned short int n, unsigned short int align ) { return (n + (align - 1hu)) / align; }
+        int ceiling_div( int n, int align ) { return (n + (align - 1n)) / align; }
+        unsigned int ceiling_div( unsigned int n, unsigned int align ) { return (n + (align - 1nu)) / align; }
+        long int ceiling_div( long int n, long int align ) { return (n + (align - 1l)) / align; }
+        unsigned long int ceiling_div( unsigned long int n, unsigned long int align ) { return (n + (align - 1lu)) / align; }
+        long long int ceiling_div( long long int n, long long int align ) { return (n + (align - 1ll)) / align; }
+        unsigned long long int ceiling_div( unsigned long long int n, unsigned long long int align ) { return (n + (align - 1llu)) / align; }
+
+        signed char ceiling( signed char n, char align ) {
+                typeof(n) trunc = floor( n, align );
+                return n < 0 || n == trunc ? trunc : trunc + align;
+        }
+        unsigned char ceiling( unsigned char n, unsigned char align ) {
+                typeof(n) trunc = floor( n, align );
+                return n == trunc ? trunc : trunc + align;
+        }
+        short int ceiling( short int n, short int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n < 0 || n == trunc ? trunc : trunc + align;
+        }
+        unsigned short int ceiling( unsigned short int n, unsigned short int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n == trunc ? trunc : trunc + align;
+        }
+        int ceiling( int n, int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n < 0 || n == trunc ? trunc : trunc + align;
+        }
+        unsigned int ceiling( unsigned int n, unsigned int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n == trunc ? trunc : trunc + align;
+        }
+        long int ceiling( long int n, long int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n < 0 || n == trunc ? trunc : trunc + align;
+        }
+        unsigned long int ceiling( unsigned long int n, unsigned long int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n == trunc ? trunc : trunc + align;
+        }
+        long long int ceiling( long long int n, signed long long int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n < 0 || n == trunc ? trunc : trunc + align;
+        }
+        unsigned long long int ceiling( unsigned long long int n, unsigned long long int align ) {
+                typeof(n) trunc = floor( n, align );
+                return n == trunc ? trunc : trunc + align;
+        }
 
         float floor( float x ) { return floorf( x ); }