OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-CompactHash commits / e8a90c2

Fixing to compile with cuda 7.5 release
e8a90c275e9f00d74e5b4748ed4a459a093f1cc6
by brobey <brobey@lanl.gov> · 2015-10-21T19:26:31.000Z

Changed files (6) +165 -50

hash/compactHash.cm +1 -1
……@@ -66,7 +66,7 @@ unsigned int c = COMPRESS_FUNC(((CL_GLOBAL NAME##MODIFIER##Hash_TableData*)table
6666#endif
6767
6868#define OPEN_COMPACT_HASH_SEARCH_EXP(NAME, MODIFIER, COMPRESS_FUNC, COMPRESS_FUNC_DATA, READ_KEY_EXP, CL_GLOBAL, JUMP_EXP, CYCLE_EXP) \
69 NAME##MODIFIER##Hash_TableData* mytableData = (NAME##MODIFIER##Hash_TableData*)tableData;\
69 GLOBAL NAME##MODIFIER##Hash_TableData* mytableData = (GLOBAL NAME##MODIFIER##Hash_TableData*)tableData;\
7070 NAME##Hash_CompressLCGData compressFuncData = mytableData->compressFuncData;\
7171 unsigned int c = COMPRESS_FUNC(compressFuncData, key);\
7272 unsigned long int iteration = 0;\
hash/hash.c +93 -24
……@@ -1,4 +1,31 @@
11
2/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
3 This file is part of the GNU C Library.
4
5 The GNU C Library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Lesser General Public
7 License as published by the Free Software Foundation; either
8 version 2.1 of the License, or (at your option) any later version.
9
10 The GNU C Library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Lesser General Public License for more details.
14
15 You should have received a copy of the GNU Lesser General Public
16 License along with the GNU C Library; if not, see
17 <http://www.gnu.org/licenses/>. */
18/* This header is separate from features.h so that the compiler can
19 include it implicitly at the start of every compilation. It must
20 not itself include <features.h> or any other header that includes
21 <features.h> because the implicit include comes before any feature
22 test macros that may be defined in a source file before it first
23 explicitly includes a system header. GCC knows the name of this
24 header in order to preinclude it. */
25/* We do support the IEC 559 math functionality, real and complex. */
26/* wchar_t uses ISO/IEC 10646 (2nd ed., published 2011-03-15) /
27 Unicode 6.0. */
28/* We do not support C11 <threads.h>. */
229/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced
330 * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
431 * Laboratory (LANL), which is operated by Los Alamos National Security, LLC
……@@ -4118,6 +4145,33 @@ int intintLCGQuadraticOpenCompactCLHash_BufferInsertNoOverwrite(intintHash_Table
41184145}
41194146const char *hash_source =
41204147"\n"
4148"/* Copyright (C) 1991-2012 Free Software Foundation, Inc.\n"
4149" This file is part of the GNU C Library.\n"
4150"\n"
4151" The GNU C Library is free software; you can redistribute it and/or\n"
4152" modify it under the terms of the GNU Lesser General Public\n"
4153" License as published by the Free Software Foundation; either\n"
4154" version 2.1 of the License, or (at your option) any later version.\n"
4155"\n"
4156" The GNU C Library is distributed in the hope that it will be useful,\n"
4157" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
4158" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
4159" Lesser General Public License for more details.\n"
4160"\n"
4161" You should have received a copy of the GNU Lesser General Public\n"
4162" License along with the GNU C Library; if not, see\n"
4163" <http://www.gnu.org/licenses/>. */\n"
4164"/* This header is separate from features.h so that the compiler can\n"
4165" include it implicitly at the start of every compilation. It must\n"
4166" not itself include <features.h> or any other header that includes\n"
4167" <features.h> because the implicit include comes before any feature\n"
4168" test macros that may be defined in a source file before it first\n"
4169" explicitly includes a system header. GCC knows the name of this\n"
4170" header in order to preinclude it. */\n"
4171"/* We do support the IEC 559 math functionality, real and complex. */\n"
4172"/* wchar_t uses ISO/IEC 10646 (2nd ed., published 2011-03-15) /\n"
4173" Unicode 6.0. */\n"
4174"/* We do not support C11 <threads.h>. */\n"
41214175"/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced\n"
41224176" * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National \n"
41234177" * Laboratory (LANL), which is operated by Los Alamos National Security, LLC\n"
……@@ -5185,8 +5239,8 @@ const char *hash_source =
51855239" tableData[sizeof(intintLCGLinearOpenCompactCLHash_TableData)];\n"
51865240" int index;\n"
51875241" int exitCode;\n"
5188" intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5189" (intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
5242" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5243" (__global intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
51905244" intintHash_CompressLCGData compressFuncData =\n"
51915245" mytableData->compressFuncData;\n"
51925246" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5236,8 +5290,10 @@ const char *hash_source =
52365290" for (i = 0; i < numKeys; i++) {\n"
52375291" key = keys[i];\n"
52385292" valueOutput = &valuesOutput[i];\n"
5239" intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5240" (intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
5293" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData\n"
5294" =\n"
5295" (__global intintLCGLinearOpenCompactCLHash_TableData *)\n"
5296" tableData;\n"
52415297" intintHash_CompressLCGData compressFuncData =\n"
52425298" mytableData->compressFuncData;\n"
52435299" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5282,8 +5338,8 @@ const char *hash_source =
52825338" tableData[sizeof(intintLCGLinearOpenCompactCLHash_TableData)];\n"
52835339" int index;\n"
52845340" int exitCode;\n"
5285" intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5286" (intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
5341" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5342" (__global intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
52875343" intintHash_CompressLCGData compressFuncData =\n"
52885344" mytableData->compressFuncData;\n"
52895345" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5335,8 +5391,10 @@ const char *hash_source =
53355391" uint i;\n"
53365392" for (i = 0; i < numEntries; i++) {\n"
53375393" key = keys[i];\n"
5338" intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5339" (intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
5394" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData\n"
5395" =\n"
5396" (__global intintLCGLinearOpenCompactCLHash_TableData *)\n"
5397" tableData;\n"
53405398" intintHash_CompressLCGData compressFuncData =\n"
53415399" mytableData->compressFuncData;\n"
53425400" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5384,8 +5442,8 @@ const char *hash_source =
53845442" tableData[sizeof(intintLCGLinearOpenCompactCLHash_TableData)];\n"
53855443" int index;\n"
53865444" int exitCode;\n"
5387" intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5388" (intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
5445" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5446" (__global intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
53895447" intintHash_CompressLCGData compressFuncData =\n"
53905448" mytableData->compressFuncData;\n"
53915449" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5439,8 +5497,10 @@ const char *hash_source =
54395497" uint i;\n"
54405498" for (i = 0; i < numEntries; i++) {\n"
54415499" key = keys[i];\n"
5442" intintLCGLinearOpenCompactCLHash_TableData *mytableData =\n"
5443" (intintLCGLinearOpenCompactCLHash_TableData *) tableData;\n"
5500" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData\n"
5501" =\n"
5502" (__global intintLCGLinearOpenCompactCLHash_TableData *)\n"
5503" tableData;\n"
54445504" intintHash_CompressLCGData compressFuncData =\n"
54455505" mytableData->compressFuncData;\n"
54465506" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5651,8 +5711,9 @@ const char *hash_source =
56515711" tableData[sizeof(intintLCGQuadraticOpenCompactCLHash_TableData)];\n"
56525712" int index;\n"
56535713" int exitCode;\n"
5654" intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5655" (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;\n"
5714" __global intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5715" (__global intintLCGQuadraticOpenCompactCLHash_TableData *)\n"
5716" tableData;\n"
56565717" intintHash_CompressLCGData compressFuncData =\n"
56575718" mytableData->compressFuncData;\n"
56585719" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5706,8 +5767,10 @@ const char *hash_source =
57065767" for (i = 0; i < numKeys; i++) {\n"
57075768" key = keys[i];\n"
57085769" valueOutput = &valuesOutput[i];\n"
5709" intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5710" (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;\n"
5770" __global intintLCGQuadraticOpenCompactCLHash_TableData\n"
5771" *mytableData =\n"
5772" (__global intintLCGQuadraticOpenCompactCLHash_TableData *)\n"
5773" tableData;\n"
57115774" intintHash_CompressLCGData compressFuncData =\n"
57125775" mytableData->compressFuncData;\n"
57135776" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5757,8 +5820,9 @@ const char *hash_source =
57575820" tableData[sizeof(intintLCGQuadraticOpenCompactCLHash_TableData)];\n"
57585821" int index;\n"
57595822" int exitCode;\n"
5760" intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5761" (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;\n"
5823" __global intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5824" (__global intintLCGQuadraticOpenCompactCLHash_TableData *)\n"
5825" tableData;\n"
57625826" intintHash_CompressLCGData compressFuncData =\n"
57635827" mytableData->compressFuncData;\n"
57645828" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5814,8 +5878,10 @@ const char *hash_source =
58145878" uint i;\n"
58155879" for (i = 0; i < numEntries; i++) {\n"
58165880" key = keys[i];\n"
5817" intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5818" (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;\n"
5881" __global intintLCGQuadraticOpenCompactCLHash_TableData\n"
5882" *mytableData =\n"
5883" (__global intintLCGQuadraticOpenCompactCLHash_TableData *)\n"
5884" tableData;\n"
58195885" intintHash_CompressLCGData compressFuncData =\n"
58205886" mytableData->compressFuncData;\n"
58215887" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5869,8 +5935,9 @@ const char *hash_source =
58695935" tableData[sizeof(intintLCGQuadraticOpenCompactCLHash_TableData)];\n"
58705936" int index;\n"
58715937" int exitCode;\n"
5872" intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5873" (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;\n"
5938" __global intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5939" (__global intintLCGQuadraticOpenCompactCLHash_TableData *)\n"
5940" tableData;\n"
58745941" intintHash_CompressLCGData compressFuncData =\n"
58755942" mytableData->compressFuncData;\n"
58765943" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
……@@ -5929,8 +5996,10 @@ const char *hash_source =
59295996" uint i;\n"
59305997" for (i = 0; i < numEntries; i++) {\n"
59315998" key = keys[i];\n"
5932" intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =\n"
5933" (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;\n"
5999" __global intintLCGQuadraticOpenCompactCLHash_TableData\n"
6000" *mytableData =\n"
6001" (__global intintLCGQuadraticOpenCompactCLHash_TableData *)\n"
6002" tableData;\n"
59346003" intintHash_CompressLCGData compressFuncData =\n"
59356004" mytableData->compressFuncData;\n"
59366005" unsigned int c = intintHash_CompressLCG(compressFuncData, key);\n"
hash/hash.cl +66 -24
……@@ -1,4 +1,31 @@
11
2/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
3 This file is part of the GNU C Library.
4
5 The GNU C Library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Lesser General Public
7 License as published by the Free Software Foundation; either
8 version 2.1 of the License, or (at your option) any later version.
9
10 The GNU C Library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Lesser General Public License for more details.
14
15 You should have received a copy of the GNU Lesser General Public
16 License along with the GNU C Library; if not, see
17 <http://www.gnu.org/licenses/>. */
18/* This header is separate from features.h so that the compiler can
19 include it implicitly at the start of every compilation. It must
20 not itself include <features.h> or any other header that includes
21 <features.h> because the implicit include comes before any feature
22 test macros that may be defined in a source file before it first
23 explicitly includes a system header. GCC knows the name of this
24 header in order to preinclude it. */
25/* We do support the IEC 559 math functionality, real and complex. */
26/* wchar_t uses ISO/IEC 10646 (2nd ed., published 2011-03-15) /
27 Unicode 6.0. */
28/* We do not support C11 <threads.h>. */
229/* Copyright 2013-14. Los Alamos National Security, LLC. This material was produced
330 * under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
431 * Laboratory (LANL), which is operated by Los Alamos National Security, LLC
……@@ -1066,8 +1093,8 @@ int intintLCGLinearOpenCompactCLHash_InnerQuerySingle(__global char *tableData,
10661093 tableData[sizeof(intintLCGLinearOpenCompactCLHash_TableData)];
10671094 int index;
10681095 int exitCode;
1069 intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1070 (intintLCGLinearOpenCompactCLHash_TableData *) tableData;
1096 __global intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1097 (__global intintLCGLinearOpenCompactCLHash_TableData *) tableData;
10711098 intintHash_CompressLCGData compressFuncData =
10721099 mytableData->compressFuncData;
10731100 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1117,8 +1144,10 @@ int intintLCGLinearOpenCompactCLHash_InnerQuery(__global char *tableData,
11171144 for (i = 0; i < numKeys; i++) {
11181145 key = keys[i];
11191146 valueOutput = &valuesOutput[i];
1120 intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1121 (intintLCGLinearOpenCompactCLHash_TableData *) tableData;
1147 __global intintLCGLinearOpenCompactCLHash_TableData *mytableData
1148 =
1149 (__global intintLCGLinearOpenCompactCLHash_TableData *)
1150 tableData;
11221151 intintHash_CompressLCGData compressFuncData =
11231152 mytableData->compressFuncData;
11241153 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1163,8 +1192,8 @@ int intintLCGLinearOpenCompactCLHash_InnerInsertSingle(__global char *tableData,
11631192 tableData[sizeof(intintLCGLinearOpenCompactCLHash_TableData)];
11641193 int index;
11651194 int exitCode;
1166 intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1167 (intintLCGLinearOpenCompactCLHash_TableData *) tableData;
1195 __global intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1196 (__global intintLCGLinearOpenCompactCLHash_TableData *) tableData;
11681197 intintHash_CompressLCGData compressFuncData =
11691198 mytableData->compressFuncData;
11701199 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1216,8 +1245,10 @@ int intintLCGLinearOpenCompactCLHash_InnerInsert(__global char *tableData,
12161245 uint i;
12171246 for (i = 0; i < numEntries; i++) {
12181247 key = keys[i];
1219 intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1220 (intintLCGLinearOpenCompactCLHash_TableData *) tableData;
1248 __global intintLCGLinearOpenCompactCLHash_TableData *mytableData
1249 =
1250 (__global intintLCGLinearOpenCompactCLHash_TableData *)
1251 tableData;
12211252 intintHash_CompressLCGData compressFuncData =
12221253 mytableData->compressFuncData;
12231254 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1265,8 +1296,8 @@ int intintLCGLinearOpenCompactCLHash_InnerInsertSingleNoOverwrite(__global char
12651296 tableData[sizeof(intintLCGLinearOpenCompactCLHash_TableData)];
12661297 int index;
12671298 int exitCode;
1268 intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1269 (intintLCGLinearOpenCompactCLHash_TableData *) tableData;
1299 __global intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1300 (__global intintLCGLinearOpenCompactCLHash_TableData *) tableData;
12701301 intintHash_CompressLCGData compressFuncData =
12711302 mytableData->compressFuncData;
12721303 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1320,8 +1351,10 @@ int intintLCGLinearOpenCompactCLHash_InnerInsertNoOverwrite(__global char
13201351 uint i;
13211352 for (i = 0; i < numEntries; i++) {
13221353 key = keys[i];
1323 intintLCGLinearOpenCompactCLHash_TableData *mytableData =
1324 (intintLCGLinearOpenCompactCLHash_TableData *) tableData;
1354 __global intintLCGLinearOpenCompactCLHash_TableData *mytableData
1355 =
1356 (__global intintLCGLinearOpenCompactCLHash_TableData *)
1357 tableData;
13251358 intintHash_CompressLCGData compressFuncData =
13261359 mytableData->compressFuncData;
13271360 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1532,8 +1565,9 @@ int intintLCGQuadraticOpenCompactCLHash_InnerQuerySingle(__global char
15321565 tableData[sizeof(intintLCGQuadraticOpenCompactCLHash_TableData)];
15331566 int index;
15341567 int exitCode;
1535 intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1536 (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;
1568 __global intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1569 (__global intintLCGQuadraticOpenCompactCLHash_TableData *)
1570 tableData;
15371571 intintHash_CompressLCGData compressFuncData =
15381572 mytableData->compressFuncData;
15391573 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1587,8 +1621,10 @@ int intintLCGQuadraticOpenCompactCLHash_InnerQuery(__global char *tableData,
15871621 for (i = 0; i < numKeys; i++) {
15881622 key = keys[i];
15891623 valueOutput = &valuesOutput[i];
1590 intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1591 (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;
1624 __global intintLCGQuadraticOpenCompactCLHash_TableData
1625 *mytableData =
1626 (__global intintLCGQuadraticOpenCompactCLHash_TableData *)
1627 tableData;
15921628 intintHash_CompressLCGData compressFuncData =
15931629 mytableData->compressFuncData;
15941630 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1638,8 +1674,9 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsertSingle(__global char
16381674 tableData[sizeof(intintLCGQuadraticOpenCompactCLHash_TableData)];
16391675 int index;
16401676 int exitCode;
1641 intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1642 (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;
1677 __global intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1678 (__global intintLCGQuadraticOpenCompactCLHash_TableData *)
1679 tableData;
16431680 intintHash_CompressLCGData compressFuncData =
16441681 mytableData->compressFuncData;
16451682 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1695,8 +1732,10 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsert(__global char *tableData,
16951732 uint i;
16961733 for (i = 0; i < numEntries; i++) {
16971734 key = keys[i];
1698 intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1699 (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;
1735 __global intintLCGQuadraticOpenCompactCLHash_TableData
1736 *mytableData =
1737 (__global intintLCGQuadraticOpenCompactCLHash_TableData *)
1738 tableData;
17001739 intintHash_CompressLCGData compressFuncData =
17011740 mytableData->compressFuncData;
17021741 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1750,8 +1789,9 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsertSingleNoOverwrite(__global
17501789 tableData[sizeof(intintLCGQuadraticOpenCompactCLHash_TableData)];
17511790 int index;
17521791 int exitCode;
1753 intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1754 (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;
1792 __global intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1793 (__global intintLCGQuadraticOpenCompactCLHash_TableData *)
1794 tableData;
17551795 intintHash_CompressLCGData compressFuncData =
17561796 mytableData->compressFuncData;
17571797 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
……@@ -1810,8 +1850,10 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsertNoOverwrite(__global char
18101850 uint i;
18111851 for (i = 0; i < numEntries; i++) {
18121852 key = keys[i];
1813 intintLCGQuadraticOpenCompactCLHash_TableData *mytableData =
1814 (intintLCGQuadraticOpenCompactCLHash_TableData *) tableData;
1853 __global intintLCGQuadraticOpenCompactCLHash_TableData
1854 *mytableData =
1855 (__global intintLCGQuadraticOpenCompactCLHash_TableData *)
1856 tableData;
18151857 intintHash_CompressLCGData compressFuncData =
18161858 mytableData->compressFuncData;
18171859 unsigned int c = intintHash_CompressLCG(compressFuncData, key);
hash/hash.clp +2 -0
……@@ -30,6 +30,8 @@
3030 * This is LANL Copyright Disclosure C14043/LA-CC-14-003
3131 */
3232
33#define GLOBAL __global
34
3335int intintIdentityPerfectCLHash_InsertSingle(__global char *tableData,
3436 int key, int value);
3537int intintIdentityPerfectCLHash_InnerInsertSingle(__global char *tableData,
hash/hash.cp +2 -0
……@@ -30,6 +30,8 @@
3030 * This is LANL Copyright Disclosure C14043/LA-CC-14-003
3131 */
3232
33#define GLOBAL
34
3335#undef UNDEFINED
3436#ifdef UNDEFINED
3537/**
neigh2d.c +1 -1
……@@ -248,7 +248,7 @@ int main (int argc, const char * argv[])
248248 }else{
249249 for (int i = 0; i < argc; i++) {
250250 if (strcmp(argv[i], "-h") == 0) {
251 printf("Use '-t' to set threshold and '-o' to add tests: br, kd, hc, hlc, hc1, hlc1, hc2, hlc2, hc3, hlc3, holc3, hg, hg1, hg2, hg3, hg4 hlg hlg1 hlg2 hlg3 holg3\n");
251 printf("Use '-t' to set threshold and '-o' to add tests: br kd hc hlc hc1 hlc1 hc2 hlc2 hc3 hlc3 holc3 hg hg1 hg2 hg3 hlg hlg1 hlg2 hlg3 holg3\n");
252252 printf("Use -r for randomization of cell data to see performance without cache\n");
253253 printf("Use -n for min mesh size and -N for max mesh size [ default is 256 min to 256 max ]\n");
254254 printf("Use -l for min levmx and -L for max levmx [ default is 1 min to 5 max ]\n");