changes

[cdsspec-compiler.git] / benchmark / cliffc-hashtable / main.cc

diff --git a/benchmark/cliffc-hashtable/main.cc b/benchmark/cliffc-hashtable/main.cc
index f18064db98e398ed7eb8a555db1ad866cab3010f..5c4f93c2b80d353dcbad61b22ea041ca01b7f338 100644 (file)
--- a/benchmark/cliffc-hashtable/main.cc
+++ b/benchmark/cliffc-hashtable/main.cc
@@ -51,82 +51,60 @@ class IntWrapper {
 
 cliffc_hashtable<IntWrapper, IntWrapper> *table;
 IntWrapper *val1, *val2;
+IntWrapper *k0, *k1, *k2, *k3, *k4, *k5;
+IntWrapper *v0, *v1, *v2, *v3, *v4, *v5;
 
 void threadA(void *arg) {
-       
-       IntWrapper *k1 = new IntWrapper(3), *k2 = new IntWrapper(2),
-               *k3 = new IntWrapper(1024), *k4 = new IntWrapper(1025);
-       IntWrapper *v1 = new IntWrapper(1024), *v2 = new IntWrapper(1025),
-               *v3 = new IntWrapper(73), *v4 = new IntWrapper(81);
-       
-       table->put(k1, v1);
-       table->put(k2, v2);
-       //table->put(k4, v3);
-       //table->put(v3, v3);
-       
-       val1 = table->get(k3);
-       if (val1 != NULL)
-               model_print("val1: %d\n", val1->_val);
-       else
-               model_print("val1: NULL\n");
-       //table->put(k3, v3);
-       
+       IntWrapper *Res;
+       int res;
+       Res = table->put(k3, v3);
+       res = Res == NULL ? 0 : Res->_val;
+       printf("Put1: key_%d, val_%d, res_%d\n", k3->_val, v3->_val, res);
+
+       Res = table->get(k2);
+       res = Res == NULL ? 0 : Res->_val;
+       printf("Get2: key_%d, res_%d\n", k2->_val, res);
 }
 
 void threadB(void *arg) {
-       /*
-       IntWrapper *k1 = new IntWrapper(3), *k2 = new IntWrapper(5),
-               *k3 = new IntWrapper(1024), *k4 = new IntWrapper(1025);
-       IntWrapper *v1 = new IntWrapper(1024), *v2 = new IntWrapper(1025),
-               *v3 = new IntWrapper(73), *v4 = new IntWrapper(81);
-       table->put(k1, v3);
-       val1 = table->get(k2);
-       table->put(k2, v4);
-       val1 = table->get(k2);
-       */
+       IntWrapper *Res;
+       int res;
+       Res = table->put(k2, v2);
+       res = Res == NULL ? 0 : Res->_val;
+       printf("Put3: key_%d, val_%d, res_%d\n", k2->_val, v2->_val, res);
+
+       Res = table->get(k3);
+       res = Res == NULL ? 0 : Res->_val;
+       printf("Get4: key_%d, res_%d\n", k3->_val, res);
 }
 
-void threadMain(void *arg) {
-       /*
-       for (int i = 0; i < 5; i++) {
-               IntWrapper *k = new IntWrapper(i), *v = new IntWrapper(i * 2);
-               table->put(k, v);
-       }
-       */
-       IntWrapper *k1 = new IntWrapper(3), *k2 = new IntWrapper(5),
-               *k3 = new IntWrapper(1024), *k4 = new IntWrapper(1025);
-       IntWrapper *v1 = new IntWrapper(1024), *v2 = new IntWrapper(1025),
-               *v3 = new IntWrapper(73), *v4 = new IntWrapper(81);
-       table->put(k3, v3);
-       //val1 = table->get(k2);
+void threadC(void *arg) {
 }
 
 int user_main(int argc, char *argv[]) {
-       thrd_t t1, t2;
-       table = new cliffc_hashtable<IntWrapper, IntWrapper>(2);
-       val1 = NULL;
-       val2 = NULL;
-       //threadMain(NULL);
+       thrd_t t1, t2, t3;
+       table = new cliffc_hashtable<IntWrapper, IntWrapper>(32);
+    k1 = new IntWrapper(3);
+       k2 = new IntWrapper(5);
+       k3 = new IntWrapper(11);
+       k4 = new IntWrapper(7);
+       k5 = new IntWrapper(13);
+
+       v0 = new IntWrapper(2048);
+       v1 = new IntWrapper(1024);
+       v2 = new IntWrapper(47);
+       v3 = new IntWrapper(73);
+       v4 = new IntWrapper(81);
+       v5 = new IntWrapper(99);
 
        thrd_create(&t1, threadA, NULL);
        thrd_create(&t2, threadB, NULL);
-       threadMain(NULL);
-
+       thrd_create(&t3, threadC, NULL);
        thrd_join(t1);
        thrd_join(t2);
-       /*
-       if (val1 == NULL) {
-               cout << "val1: NULL" << endl;
-       } else {
-               cout << val1->get() << endl;
-       }
-       //MODEL_ASSERT(val1 == NULL || val1->get() == 2 || val1->get() == 81);
-       if (val2 == NULL) {
-               cout << "val2: NULL" << endl;
-       } else {
-               cout << val2->get() << endl;
-       }
-       */
+       thrd_join(t3);
+       
        return 0;
 }
 
+