From 78b8e6a8d3dddaff829b9935d60e608f7956b6e9 Mon Sep 17 00:00:00 2001
From: Florian Ballenegger <florian.ballenegger@anamosic.com>
Date: Fri, 24 Jul 2020 15:38:48 +0200
Subject: [PATCH] cleanup

---
 src/spicelib/devices/bsim3v32/b3v32ldseq.c  |  5 -----
 src/spicelib/devices/bsim3v32/b3v32ldsimd.c | 10 ++++------
 src/spicelib/devices/bsim3v32/bsim3v32def.h |  2 ++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/spicelib/devices/bsim3v32/b3v32ldseq.c b/src/spicelib/devices/bsim3v32/b3v32ldseq.c
index fba6c72a3..e70f5817f 100644
--- a/src/spicelib/devices/bsim3v32/b3v32ldseq.c
+++ b/src/spicelib/devices/bsim3v32/b3v32ldseq.c
@@ -187,11 +187,6 @@ int BSIM3v32_ACM_junctionCapacitances
 
 /*F.B: if data is not NULL, return to do calc in SIMD except if bypass 
        if data is NULL, just perform the whole model without SIMD */
-#ifdef USE_OMP
-#pragma message "Use OMP"
-#else
-#pragma message "Dont use OMP"
-#endif
 
 /*
 prelim argument:
diff --git a/src/spicelib/devices/bsim3v32/b3v32ldsimd.c b/src/spicelib/devices/bsim3v32/b3v32ldsimd.c
index 702aa722a..1252f2cb5 100644
--- a/src/spicelib/devices/bsim3v32/b3v32ldsimd.c
+++ b/src/spicelib/devices/bsim3v32/b3v32ldsimd.c
@@ -29,10 +29,6 @@
  ******************************************************************************/
 
 #include <math.h>
-#if USEX86INTRINSICS==1
-#include <x86intrin.h>
-#endif
-#include <signal.h>
 
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
@@ -44,6 +40,10 @@
 #include "ngspice/devdefs.h"
 #include "ngspice/suffix.h"
 
+#if USEX86INTRINSICS==1
+#include <x86intrin.h>
+#endif
+
 #define MAX_EXP 5.834617425e14
 #define MIN_EXP 1.713908431e-15
 #define EXP_THRESHOLD 34.0
@@ -79,14 +79,12 @@ int BSIM3v32LoadSIMD(BSIM3v32instance **heres, CKTcircuit *ckt
 
 #if NSIMD==4
 #ifdef USE_OMP
-    #pragma message "Use OMP SIMD4 version"
     #include "b3v32ldseq_simd4d_omp.c"
 #else
     #include "b3v32ldseq_simd4d.c"
 #endif
 #elif NSIMD==8
 #ifdef USE_OMP
-    #pragma message "Use OMP SIMD8 version"
     #include "b3v32ldseq_simd8d_omp.c"
 #else
     #include "b3v32ldseq_simd8d.c"
diff --git a/src/spicelib/devices/bsim3v32/bsim3v32def.h b/src/spicelib/devices/bsim3v32/bsim3v32def.h
index d5db6e4a4..c15c3abbe 100644
--- a/src/spicelib/devices/bsim3v32/bsim3v32def.h
+++ b/src/spicelib/devices/bsim3v32/bsim3v32def.h
@@ -21,6 +21,8 @@ File: bsim3v32def.h
 #define NSIMD 4
 #endif
 
+#define OMP_EFFMEM
+
 typedef struct sBSIM3v32instance
 {