Changeset: a9e37170e0e4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9e37170e0e4
Modified Files:
monetdb5/extras/crackers/crackers_core_unordered.mx
Branch: holindex
Log Message:
Fix mr to fit "vectrorized" elements + correct assertions.
diffs (25 lines):
diff --git a/monetdb5/extras/crackers/crackers_core_unordered.mx
b/monetdb5/extras/crackers/crackers_core_unordered.mx
--- a/monetdb5/extras/crackers/crackers_core_unordered.mx
+++ b/monetdb5/extras/crackers/crackers_core_unordered.mx
@@ -1331,7 +1331,7 @@ static str CRKvectorized_MT_@2_@1 (const
mr = 0;
} else /* alt == 2 */ {
ml = (BUN) round(((double) (mm * pivot_P) / 100.0) /
(2*vector_elements)) * 2*vector_elements;
- mr = mm - ml;
+ mr = (BUN) round((mm - ml) / (2*vector_elements)) *
2*vector_elements;
if (ml == 0 || mr == 0) {
alt = 1;
ml = 0;
@@ -1464,9 +1464,9 @@ static str CRKvectorized_MT_@2_@1 (const
const BUN pi = c_Thread_arg[i].pos_r;
const BUN pj = c_Thread_arg[j].pos_r - sk;
- assert(si <= mm);
- assert(sj <= mm);
- memcpy(tmp_t, &src_t[pi], st);
+ assert((ml && mr && si <= ml+mr) ||
(!c_Thread_arg[i].ml && !c_Thread_arg[i].mr && si <= (c_Thread_arg[i].last -
c_Thread_arg[i].first + 1)));
+ assert((ml && mr && sj <= ml+mr) ||
(!c_Thread_arg[j].ml && !c_Thread_arg[j].mr && sj <= (c_Thread_arg[j].last -
c_Thread_arg[j].first + 1)));
+ memcpy(tmp_t, &src_t[pi], st);
memcpy(&src_t[pi], &src_t[pj], st);
memcpy(&src_t[pj], tmp_t, st);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
