X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMemory.c;h=ef4ccec2879171b0a7b63abbbd9e3d46065e3545;hb=8cafd9ea08a6b1103eab29811227a7ae536dffa6;hp=d9d1f942c7e11c3c8ddf05e4d2d5ab58fac1f24e;hpb=109880839321408644c94a34eb31208460b9f46d;p=LbmBenchmarkKernelsPublic.git
diff --git a/src/Memory.c b/src/Memory.c
index d9d1f94..ef4ccec 100644
--- a/src/Memory.c
+++ b/src/Memory.c
@@ -8,6 +8,10 @@
// Viktor Haag, 2016
// LSS, University of Erlangen-Nuremberg, Germany
//
+// Michael Hussnaetter, 2017-2018
+// University of Erlangen-Nuremberg, Germany
+// michael.hussnaetter -at- fau.de
+//
// This file is part of the Lattice Boltzmann Benchmark Kernels (LbmBenchKernels).
//
// LbmBenchKernels is free software: you can redistribute it and/or modify
@@ -24,11 +28,28 @@
// along with LbmBenchKernels. If not, see .
//
// --------------------------------------------------------------------------
+// TODO: make configurable
+#define HAVE_HUGE_PAGES
+
+
+#ifdef HAVE_HUGE_PAGES
+#define _BSD_SOURCE
+#endif
+
#include
#include
#include // strerror
#include
+
+#ifdef HAVE_MEMKIND
+#include
+#endif
+
+#ifdef HAVE_HUGE_PAGES
+#include // madvise
+#endif
+
#include "Base.h"
#include "Memory.h"
@@ -60,6 +81,19 @@ int MemAllocAligned(void ** ptr, size_t bytesToAlloc, size_t alignmentBytes)
exit(1);
}
+#ifdef HAVE_HUGE_PAGES
+
+ if (alignmentBytes % 4096 == 0) {
+ ret = madvise(*ptr, bytesToAlloc, MADV_HUGEPAGE);
+
+ if (ret != 0) {
+ DEBUG_BREAK_POINT();
+ Error("madvise(%p, %lu, MADV_HUGEPAGE) failed: %d - %s.\n", *ptr, bytesToAlloc, errno, strerror(errno));
+ exit(1);
+ }
+ }
+#endif
+
return 0;
}
@@ -84,3 +118,48 @@ int MemZero(void * ptr, size_t bytesToZero)
return 0;
}
+
+#ifdef HAVE_MEMKIND
+int HbwAlloc(void ** ptr, size_t bytesToAlloc)
+{
+ void * tmpPtr;
+
+ tmpPtr = hbw_malloc(bytesToAlloc);
+
+ if (tmpPtr == NULL) { // && bytesToAlloc != 0) {
+ Error("allocation of %lu bytes in HBM failed: %d - %s\n", bytesToAlloc, errno, strerror(errno));
+ exit(1);
+ }
+
+ *ptr = tmpPtr;
+
+ return 0;
+}
+
+int HbwAllocAligned(void ** ptr, size_t bytesToAlloc, size_t alignmentBytes)
+{
+ int ret;
+
+ ret = hbw_posix_memalign(ptr, alignmentBytes, bytesToAlloc);
+
+ if (ret) {
+ Error("allocation of %lu bytes in HBM aligned to %lu bytes failed: %d - %s\n", bytesToAlloc, alignmentBytes, errno, strerror(errno));
+ exit(1);
+ }
+
+ return 0;
+}
+
+
+int HbwFree(void ** ptr)
+{
+ Assert(*ptr != NULL);
+
+ hbw_free(*ptr);
+
+ *ptr = NULL;
+
+ return 0;
+}
+
+#endif // HAVE_MEMKIND