From d8c82fd281b73faf8e7f74d7a1fe6af4bae1d060 Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Mon, 5 Sep 2022 08:53:33 +0000
Subject: [PATCH] L1: fix CI build
---
reco/L1/vectors/L1vec.h | 1 +
reco/L1/vectors/std_alloc.h | 12 +++++-------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/reco/L1/vectors/L1vec.h b/reco/L1/vectors/L1vec.h
index 5c04fc2a4f..901ab2f7fa 100644
--- a/reco/L1/vectors/L1vec.h
+++ b/reco/L1/vectors/L1vec.h
@@ -6,5 +6,6 @@
#define L1vec_H
#include "vectors/L1vecVc.h"
+//#include "vectors/L1vecPseudo.h"
#endif
diff --git a/reco/L1/vectors/std_alloc.h b/reco/L1/vectors/std_alloc.h
index fdd3503379..d744dd1f1d 100644
--- a/reco/L1/vectors/std_alloc.h
+++ b/reco/L1/vectors/std_alloc.h
@@ -6,12 +6,10 @@
#define STD_ALLOC_H
// ---------------------- Allocator for using STL ------------------------
+#include <Vc/Vc>
#include <limits>
#include <vector>
-#include "xmmintrin.h"
-
-
namespace nsL1
{
@@ -113,10 +111,10 @@ namespace nsL1
void* operator new(size_t size, void* ptr) { return ::operator new(size, ptr); }
void* operator new[](size_t size, void* ptr) { return ::operator new(size, ptr); }
- void* operator new(size_t size) { return _mm_malloc(size, 16); }
- void* operator new[](size_t size) { return _mm_malloc(size, 16); }
- void operator delete(void* ptr, size_t) { _mm_free(ptr); }
- void operator delete[](void* ptr, size_t) { _mm_free(ptr); }
+ void* operator new(size_t size) { return Vc::malloc<T, Vc::AlignOnCacheline>(size / sizeof(T) + 1); }
+ void* operator new[](size_t size) { return Vc::malloc<T, Vc::AlignOnCacheline>(size / sizeof(T) + 1); }
+ void operator delete(void* ptr, size_t) { Vc::free(ptr); }
+ void operator delete[](void* ptr, size_t) { Vc::free(ptr); }
}; // SimdAlloc
// return that all specializations of this allocator are interchangeable
--
GitLab