[test-suite] Fix OpenBSD build

[brad]

Summary

• Some fixes or workarounds (JM) for not having sys/timeb.h / ftime().
• Use rusage() in minisat.
• Use termios in office-ispell.
• Don't try to use memalign() in oourafft.
• For 2005-05-11-Popcount-ffs-fls, OpenBSD does not have ffsl() yet.

[dim]

LGTM

MultiSource/Applications/SPASS/clock.h

52

These CLOCK_NO_TIMING parts are because we don't really care about the actual timing, just if the program runs correctly, right?

SingleSource/Benchmarks/Misc/oourafft.c

6

Just a nit, but maybe this collection of #if statements should simply be ripped out and replaced by one #define ? :) Not terribly important though.

SingleSource/UnitTests/2005-05-11-Popcount-ffs-fls.c

82

What's the XXX for? In FreeBSD we have ffsl() in <strings.h>, but maybe at some point OpenBSD will get that too?

[brad]

SingleSource/Benchmarks/Misc/oourafft.c

6

Just a nit, but maybe this collection of #if statements should simply be ripped out and replaced by one #define ? :) Not terribly important though.

Well sometimes if there is room for simplifying or improving things like this I don't mind.

Looking at this from the other way around, what OS's do need memalign() as patching for this I know there are not a lot of OS's that do have memalign(). Solaris and Linux are not listed.

SingleSource/UnitTests/2005-05-11-Popcount-ffs-fls.c

82

What's the XXX for? In FreeBSD we have ffsl() in <strings.h>, but maybe at some point OpenBSD will get that too?

As a reminder to be removed when OpenBSD does have the proper function.

MultiSource/Applications/CMakeLists.txt

+if(NOT TARGET_OS STREQUAL "OpenBSD")
   add_subdirectory(JM)
+endif()
+
 add_subdirectory(SIBsim4)
 add_subdirectory(aha)
 add_subdirectory(d)
 if(NOT ARCH STREQUAL "PowerPC")
 # This test has problems running on powerpc starting with r295538 and should
 # be restored when the issue is corrected.
   add_subdirectory(oggenc)
 endif()

MultiSource/Applications/SPASS/clock.h

 
 /* $RCSfile$ */
 
 #ifndef _CLOCK_
 #define _CLOCK_
 
 #include "misc.h"
 #include <sys/types.h>
+#ifndef CLOCK_NO_TIMING
 #include <sys/timeb.h>
+#endif
 
 typedef enum {
   clock_BACKTRACK,
   clock_OVERALL,
   clock_INPUT,
   clock_CNF,
   clock_REDUCTION,
   clock_INFERENCE,
   clock_TYPESIZE
 } CLOCK_CLOCKS;
 
+#ifndef CLOCK_NO_TIMING
 typedef struct timeb CLOCK_TMS;
+#endif
 
 void   clock_Init(void);
 void   clock_InitCounter(CLOCK_CLOCKS);
 void   clock_StartCounter(CLOCK_CLOCKS);
 void   clock_StopPassedTime(CLOCK_CLOCKS);
 void   clock_StopAddPassedTime(CLOCK_CLOCKS);
 float  clock_GetSeconds(CLOCK_CLOCKS);
 void   clock_PrintTime(CLOCK_CLOCKS);
 
 #ifdef WIN
 void clock_PingOneSecond(void);
 #endif
 
 #endif

MultiSource/Applications/SPASS/clock.c

 #include "clock.h"
 
 
 /**************************************************************/
 /* Global Variables                                           */
 /**************************************************************/
 
 float      clock_Akku[clock_TYPESIZE];
+#ifndef CLOCK_NO_TIMING
 CLOCK_TMS  clock_Counters[clock_TYPESIZE];
+#endif
 
 #ifdef WIN
 float      clock_Ping;
 #endif
 
 /**************************************************************/
 /* Functions                                                  */
 /**************************************************************/

MultiSource/Applications/minisat/Main.cpp

static inline int memReadStat(int field)
     for (; field >= 0; field--)
         fscanf(in, "%d", &value);
     fclose(in);
     return value;
 }
 static inline uint64_t memUsed() { return (uint64_t)memReadStat(0) * (uint64_t)getpagesize(); }
 
 
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 static inline uint64_t memUsed(void) {
     struct rusage ru;
     getrusage(RUSAGE_SELF, &ru);
     return ru.ru_maxrss*1024; }
 
 
 #else
 static inline uint64_t memUsed() { return 0; }

MultiSource/Benchmarks/MiBench/office-ispell/term.c

  */
 
 #include "config.h"
 #include "ispell.h"
 #include "proto.h"
 #include "msgs.h"
 #include <signal.h>
 
-#if defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || (defined(__sun__) && defined(__svr4__))
-/* Use termios under at least glibc */
+#if defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+    defined(__OpenBSD__) || defined(__APPLE__) || \
+    (defined(__sun__) && defined(__svr4__))
 #include <termios.h>
 #define USE_TERMIOS
 #ifndef USG
 #define USG
 #endif
 #else
 #ifdef USG
 #include <termio.h>

SingleSource/Benchmarks/Misc/oourafft.c

 #include <math.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdlib.h>
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(_AIX) // memalign
+/* memalign */
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
+    !defined(__OpenBSD__) && !defined(_AIX)
 #include <malloc.h>
 #endif
 
 /* random number generator, 0 <= RND < 1 */
 #define RND(p) ((*(p) = (*(p) * 7141 + 54773) % 259200) * (1.0 / 259200.0))
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
 void makewt(int nw, int *ip, double *w);
int main()
   double t_start, t_end, t_overhead, t_total = 0, err_val;
 
   /* Measure overhead of get_time() call */
   t_start = get_time();
   t_end = get_time();
   t_overhead = t_end - t_start;
 
   /* Prepare aux data */
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(_AIX) /* Darwin always 16-byte aligns malloc data */
+  /* Darwin always 16-byte aligns malloc data */
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
+    !defined(__OpenBSD__) && !defined(_AIX)
   ip = memalign(16, sqrt(N)*sizeof(int));
   w  = memalign(16, 2*N*5/4*sizeof(double));
 #else
   ip = malloc(sqrt(N)*sizeof(int));
   w  = malloc(2*N*5/4*sizeof(double));
 #endif
   makewt(N >> 1, ip, w);
   
   /* Allocate buffers */
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(_AIX) /* Darwin always 16-byte aligns malloc data */
+  /* Darwin always 16-byte aligns malloc data */
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
+    !defined(__OpenBSD__) && !defined(_AIX)
   ref = memalign(16, 2*N*sizeof(double));
   cmp = memalign(16, 2*N*sizeof(double));
   src = memalign(16, 2*N*sizeof(double));
 #else
   ref = malloc(2*N*sizeof(double));
   cmp = malloc(2*N*sizeof(double));
   src = malloc(2*N*sizeof(double));
 #endif
if (n > 4) {
     }
   } else if (n == 4) {
     cftfsub(n, a, w);
   }
 }
 
 /* -------- initializing routines -------- */
 
-#include <math.h>
-
 void makewt(int nw, int *ip, double *w)
 {
   int j, nwh;
   double delta, x, y;
     
   if (nw > 2) {
     nwh = nw >> 1;
     delta = atan(1.0) / nwh;

SingleSource/UnitTests/2005-05-11-Popcount-ffs-fls.c

 #define __builtin_ffsl __builtin_ffs
 #define ffsl ffs
 #endif
 
 #if defined(__NetBSD__)
 #define ffsl ffs64
 #endif
 
+/* XXX */
+#if defined(__OpenBSD__)
+#define ffsl ffs
+#endif
+
 int i;
 int main(void) {
   long long l;
 
   /* note: we don't test zero, because the _native_ test will get it
    * wrong (GCC returns garbage for ctz/clz of 0), and the nightly tester
    * will wrongly conclude that LLC is failing.
    */