Changeset 16274 for trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.cpp

Timestamp:

11/04/18 11:05:31 (6 years ago)

Author:

bburlacu

Message:

#2958: Update dll files and C++ source code to the latest version.

File:

• trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.cpp (modified) (4 diffs)

trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.cpp

@@ -1 @@
-#include <memory>
-
 #include "interpreter.h" 
 
+#ifdef __cplusplus
 extern "C" {
+#endif
+
+constexpr size_t BUFSIZE = BATCHSIZE * sizeof(double);
 
 // slow (ish?)
@@ -22 +24 @@
 
 __declspec(dllexport)
-void __cdecl GetValuesVectorized(instruction* code, int codeLength, int* rows, int totalRows, double* result) noexcept
+void __cdecl GetValuesVectorized(instruction* code, int codeLength, int* rows, int totalRows, double* __restrict result) noexcept
 {
-    std::vector<double[BUFSIZE]> buffers(codeLength);
-    // initialize instruction buffers
+    double* buffer = static_cast<double*>(_aligned_malloc(codeLength * BUFSIZE, 16));
     for (int i = 0; i < codeLength; ++i)
     {
         instruction& in = code[i];
-        in.buf = buffers[i];
+        in.buf = buffer + (i * BATCHSIZE);
 
         if (in.opcode == OpCodes::Const)
@@ -37 +38 @@
     }
 
-    int remainingRows = totalRows % BUFSIZE;
+    int remainingRows = totalRows % BATCHSIZE;
     int total = totalRows - remainingRows;
 
-    for (int rowIndex = 0; rowIndex < total; rowIndex += BUFSIZE)
+    for (int rowIndex = 0; rowIndex < total; rowIndex += BATCHSIZE)
     {
-        evaluate(code, codeLength, rows, rowIndex, BUFSIZE);
-        std::memcpy(result + rowIndex, code[0].buf, BUFSIZE * sizeof(double));
+        evaluate(code, codeLength, rows, rowIndex, BATCHSIZE);
+        std::memcpy(result + rowIndex, code[0].buf, BUFSIZE);
     }
 
     // are there any rows left?
-    if (remainingRows > 0) {
+    if (remainingRows > 0) 
+    {
         for (int rowIndex = total; rowIndex < totalRows; rowIndex += remainingRows)
         {
@@ -54 +56 @@
         }
     }
+    _aligned_free(buffer);
 }