Changeset 821 for soft/giet_vm/applications/rosenfeld/nrc2/src/nrarith2x.c

Timestamp:

May 6, 2016, 3:06:29 PM (9 years ago)

Author:

meunier

Message:

• Added several versions of rosenfeld: { SLOW, FAST } x { FEATURES, NO_FEATURES }
• Added native linux compilation support
• Added a script to check results natively
• Started to refactor nrc code

File:

• soft/giet_vm/applications/rosenfeld/nrc2/src/nrarith2x.c (modified) (2 diffs)

soft/giet_vm/applications/rosenfeld/nrc2/src/nrarith2x.c

@@ -17 +17 @@
 #include <malloc.h>
 #include <math.h> // fabs
-// #include <memory.h> // memcpy
 
+#include "nrc_os_config.h"
 #include "mypredef.h"
 #include "nrtype.h"
@@ -25 +25 @@
 #include "nrkernel.h"
 
-/* ------------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) addcnz_bmatrix(byte **src,long nrl,long nrh,long ncl, long nch, byte  cte, byte **dst)
-/* ------------------------------------------------------------------------------------- */
-{
-        long i,j;
-        byte *Xi, *Yi;
-        
-        for(i=nrl; i<=nrh; i++) {
-                Xi = src[i];
-                Yi = dst[i];
-                for(j=ncl; j<=nch; j++) {
-                        if(Xi[j])
-                                Yi[j] = Xi[j] + cte;
-                        else
-                                Yi[j] = Xi[j];
-                }
-        }
+
+#undef addcnz_type_matrix
+#define addcnz_type_matrix(t) \
+void short_name(t,addcnz_,matrix)(t ** src, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, t cte, t ** dst) \
+{                                              \
+        t * Xi;                                    \
+    t * Yi;                                    \
+        for (int32_t i = nrl; i <= nrh; i++) {     \
+                Xi = src[i];                           \
+                Yi = dst[i];                           \
+                for (int32_t j = ncl; j <= nch; j++) { \
+                        if (Xi[j] != 0) {                  \
+                                Yi[j] = Xi[j] + cte;           \
+            }                                  \
+                        else {                             \
+                                Yi[j] = Xi[j];                 \
+            }                                  \
+                }                                      \
+        }                                          \
 }
-/* ----------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) addandc_bmatrix(byte **src,long nrl,long nrh,long ncl, long nch, byte  cte, byte **dst)
-/* ----------------------------------------------------------------------------------- */
-{
-        long i,j;
-        byte *Xi, *Yi;
-        
-        for(i=nrl; i<=nrh; i++) {
-                Xi = src[i];
-                Yi = dst[i];
-                for(j=ncl; j<=nch; j++) {
-                        if(Xi[j])
-                                Yi[j] = Xi[j] + cte;
-                        else
-                                Yi[j] = Xi[i];
-                }
-        }
+
+addcnz_type_matrix(int8_t);
+addcnz_type_matrix(uint8_t);
+addcnz_type_matrix(int16_t);
+addcnz_type_matrix(uint16_t);
+addcnz_type_matrix(int32_t);
+addcnz_type_matrix(uint32_t);
+addcnz_type_matrix(int64_t);
+addcnz_type_matrix(uint64_t);
+addcnz_type_matrix(float);
+addcnz_type_matrix(double);
+
+
+#undef addandc_type_matrix
+#define addandc_type_matrix(t) \
+void short_name(t,addandc_,matrix)(t ** src, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, t cte, t ** dst) \
+{                                              \
+        t * Xi;                                    \
+    t * Yi;                                    \
+        for (int32_t i = nrl; i <= nrh; i++) {     \
+                Xi = src[i];                           \
+                Yi = dst[i];                           \
+                for (int32_t j = ncl; j <= nch; j++) { \
+                        if (Xi[j] != 0) {                  \
+                Yi[j] = Xi[j] + cte;           \
+            }                                  \
+                }                                      \
+        }                                          \
 }
-/* ---------------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) addandc_si16matrix(sint16 **src,long nrl,long nrh,long ncl, long nch, short cte, sint16 **dst)
-/* ---------------------------------------------------------------------------------------- */
-{
-        long i,j;
-        sint16 *Xi, *Yi;
-        
-        for(i=nrl; i<=nrh; i++) {
-                Xi = src[i];
-                Yi = dst[i];
-                for(j=ncl; j<=nch; j++) {
-                        if(Xi[j]) Yi[j] = Xi[j] + cte;
-                }
-        }
+
+addandc_type_matrix(int8_t);
+addandc_type_matrix(uint8_t);
+addandc_type_matrix(int16_t);
+addandc_type_matrix(uint16_t);
+addandc_type_matrix(int32_t);
+addandc_type_matrix(uint32_t);
+addandc_type_matrix(int64_t);
+addandc_type_matrix(uint64_t);
+addandc_type_matrix(float);
+addandc_type_matrix(double);
+
+
+#undef sum_type_matrix
+#define sum_type_matrix(t,rt) \
+rt short_name(t,sum_,matrix)(t ** m, int32_t nrl, int32_t nrh,int32_t ncl, int32_t nch) \
+{                                              \
+        rt s = 0;                                  \
+        t * Xi;                                    \
+        for (int32_t i = nrl; i <= nrh; i++) {     \
+                Xi = m[i];                             \
+                for (int32_t j = ncl; j <= nch; j++) { \
+                        s += Xi[j];                        \
+                }                                      \
+    }                                          \
+    return s;                                  \
 }
-/* ------------------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) addandc_ui16matrix(uint16 **src,long nrl,long nrh,long ncl, long nch, short cte, uint16 **dst)
-/* ------------------------------------------------------------------------------------------ */
-{
-        long i,j;
-        uint16 *Xi, *Yi;
-        
-        for(i=nrl; i<=nrh; i++) {
-                Xi = src[i];
-                Yi = dst[i];
-                for(j=ncl; j<=nch; j++) {
-                        if(Xi[j]) Yi[j] = Xi[j] + cte;
-                }
-        }
-}
-/* ----------------------------------------------------------- */
-IMAGE_EXPORT(int) count_bmatrix(byte **m, long nrl,long nrh,long ncl, long nch)
-/* ----------------------------------------------------------- */
-{
-        long i, j;
-        int s = 0;
-        byte *Xi;
-        
-        for(i=nrl; i<=nrh; i++) {
-                Xi = m[i];
-                for(j=ncl; j<=nch; j++) {
-                        s += Xi[j];
-                }
-    }
-    return s;
-}
+
+
+sum_type_matrix(int8_t, int32_t);
+sum_type_matrix(uint8_t, uint32_t);
+sum_type_matrix(int16_t, int32_t);
+sum_type_matrix(uint16_t, uint32_t);
+sum_type_matrix(int32_t, int64_t);
+sum_type_matrix(uint32_t, uint64_t);
+sum_type_matrix(int64_t, int64_t);
+sum_type_matrix(uint64_t, uint64_t);
+sum_type_matrix(float, float);
+sum_type_matrix(double, double);
+
+
+// Local Variables:
+// tab-width: 4
+// c-basic-offset: 4
+// c-file-offsets:((innamespace . 0)(inline-open . 0))
+// indent-tabs-mode: nil
+// End:
+
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+