Test with custom mutex.

jblueh · jblueh · commit 9ba1cbfefc7b · 2025-09-11T11:37:23.000+02:00
diff --git a/tests/results/FirstOrderReverseCustomMutex.ref b/tests/results/FirstOrderReverseCustomMutex.ref
@@ -1,18 +1,18 @@
 Point 0 :
--723.925
--5515.29
-95.0474
--6729
--2140.22
+-348.826
+769.932
+1996.83
+-14980.6
+-2788.03
 Point 1 :
--325.634
-3921.84
-7865.3
-4847.89
--3985.11
+-336.432
+-818.028
+3154.85
+4708.61
+1741.92
 Point 2 :
-237.233
-4779.5
--3268.62
--5359.29
--10427.2
+-38.4341
+-3102.3
+-8004.34
+-5462.34
+-46717.7
diff --git a/tests/results/FirstOrderReverseNestedParallelCustomMutex.ref b/tests/results/FirstOrderReverseNestedParallelCustomMutex.ref
@@ -1,18 +1,18 @@
 Point 0 :
--723.925
--5515.29
-95.0474
--6729
--2140.22
+-348.826
+769.932
+1996.83
+-14980.6
+-2788.03
 Point 1 :
--325.634
-3921.84
-7865.3
-4847.89
--3985.11
+-336.432
+-818.028
+3154.85
+4708.61
+1741.92
 Point 2 :
-237.233
-4779.5
--3268.62
--5359.29
--10427.2
+-38.4341
+-3102.3
+-8004.34
+-5462.34
+-46717.7
diff --git a/tests/results/FirstOrderReverseNoOpenMPCustomMutex.ref b/tests/results/FirstOrderReverseNoOpenMPCustomMutex.ref
@@ -1,18 +1,18 @@
 Point 0 :
--723.925
--5515.29
-95.0474
--6729
--2140.22
+-348.826
+769.932
+1996.83
+-14980.6
+-2788.03
 Point 1 :
--325.634
-3921.84
-7865.3
-4847.89
--3985.11
+-336.432
+-818.028
+3154.85
+4708.61
+1741.92
 Point 2 :
-237.233
-4779.5
--3268.62
--5359.29
--10427.2
+-38.4341
+-3102.3
+-8004.34
+-5462.34
+-46717.7
diff --git a/tests/results/FirstOrderReverseNoParallelCustomMutex.ref b/tests/results/FirstOrderReverseNoParallelCustomMutex.ref
@@ -1,18 +1,18 @@
 Point 0 :
--723.925
--5515.29
-95.0474
--6729
--2140.22
+-348.826
+769.932
+1996.83
+-14980.6
+-2788.03
 Point 1 :
--325.634
-3921.84
-7865.3
-4847.89
--3985.11
+-336.432
+-818.028
+3154.85
+4708.61
+1741.92
 Point 2 :
-237.233
-4779.5
--3268.62
--5359.29
--10427.2
+-38.4341
+-3102.3
+-8004.34
+-5462.34
+-46717.7
diff --git a/tests/results/FirstOrderReversePassiveCustomMutex.ref b/tests/results/FirstOrderReversePassiveCustomMutex.ref
@@ -1,17 +1,17 @@
 Point 0 :
--723.925
+-348.826
 0
 0
 0
 0
 Point 1 :
--325.634
+-336.432
 0
 0
 0
 0
 Point 2 :
-237.233
+-38.4341
 0
 0
 0
diff --git a/tests/results/FirstOrderReverseSingleThreadCustomMutex.ref b/tests/results/FirstOrderReverseSingleThreadCustomMutex.ref
@@ -1,18 +1,18 @@
 Point 0 :
--723.925
--5515.29
-95.0474
--6729
--2140.22
+-348.826
+769.932
+1996.83
+-14980.6
+-2788.03
 Point 1 :
--325.634
-3921.84
-7865.3
-4847.89
--3985.11
+-336.432
+-818.028
+3154.85
+4708.61
+1741.92
 Point 2 :
-237.233
-4779.5
--3268.62
--5359.29
--10427.2
+-38.4341
+-3102.3
+-8004.34
+-5462.34
+-46717.7
diff --git a/tests/results/SecondOrderReverseForwardCustomMutex.ref b/tests/results/SecondOrderReverseForwardCustomMutex.ref
@@ -1,66 +1,66 @@
 Point 0 :
--723.925
--5515.29
-95.0474
--6729
--2140.22
-2.88369e+07
-1.52287e+06
-3519.89
-3.96565e+06
-1.52287e+06
-8.3703e+06
--1.30966e+07
-6068.5
-3519.89
--1.30966e+07
-2.94023e+07
-2.47353e+06
-3.96565e+06
-6068.5
-2.47353e+06
-1.08257e+06
+-348.826
+769.932
+1996.83
+-14980.6
+-2788.03
+-4.19503e+06
+1.09601e+06
+25105.6
+-90987.8
+1.09601e+06
+3.58603e+06
+-5.82185e+06
+4335.61
+25105.6
+-5.82185e+06
+2.55514e+07
+4.18353e+06
+-90987.8
+4335.61
+4.18353e+06
+1.02484e+06
 Point 1 :
--325.634
-3921.84
-7865.3
-4847.89
--3985.11
-2.45363e+07
-2.04504e+07
-11528.2
--1.59193e+07
-2.04504e+07
-4.35072e+07
-3.71884e+07
-57805.4
-11528.2
-3.71884e+07
-4.81492e+07
-4.52196e+06
--1.59193e+07
-57805.4
-4.52196e+06
--3.22903e+07
+-336.432
+-818.028
+3154.85
+4708.61
+1741.92
+-3.95878e+06
+-5.33337e+06
+-27268.8
+1.14391e+07
+-5.33337e+06
+1.22911e+08
+1.59486e+08
+-34592.8
+-27268.8
+1.59486e+08
+2.0342e+08
+8.34814e+06
+1.14391e+07
+-34592.8
+8.34814e+06
+6.3488e+07
 Point 2 :
-237.233
-4779.5
--3268.62
--5359.29
--10427.2
--8.25368e+07
--6.60466e+07
-6916.15
-531171
--6.60466e+07
-5.86882e+07
-8.23864e+07
-276447
-6916.15
-8.23864e+07
-6.14194e+07
-1.67793e+07
-531171
-276447
-1.67793e+07
-4.97229e+08
+-38.4341
+-3102.3
+-8004.34
+-5462.34
+-46717.7
+-2.41648e+06
+-1.92288e+06
+639.603
+-169303
+-1.92288e+06
+5.64684e+07
+4.28497e+07
+129011
+639.603
+4.28497e+07
+3.16995e+07
+1.49199e+06
+-169303
+129011
+1.49199e+06
+4.08705e+07
diff --git a/tests/tests/TestCustomMutex.hpp b/tests/tests/TestCustomMutex.hpp
@@ -70,7 +70,7 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {
             --status;
           }
           #ifdef _OPENMP
-          opdi::logic->onMutexAcquired(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));
+            opdi::logic->onMutexAcquired(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));
           #endif
         }
 
@@ -80,7 +80,7 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {
           #endif
           --status;
           #ifdef _OPENMP
-          opdi::logic->onMutexReleased(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));
+            opdi::logic->onMutexReleased(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));
           #endif
         }
     };
@@ -111,7 +111,7 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {
           Base::job2(i, in, jobResults[i]);
 
           mutex2.lock();
-          out2 += jobResults[i];
+          out2 *= jobResults[i];
           mutex2.unlock();
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,17 @@`
`1`	`1`	`Point 0 :`
`2`		`--723.925`
	`2`	`+-348.826`
`3`	`3`	`0`
`4`	`4`	`0`
`5`	`5`	`0`
`6`	`6`	`0`
`7`	`7`	`Point 1 :`
`8`		`--325.634`
	`8`	`+-336.432`
`9`	`9`	`0`
`10`	`10`	`0`
`11`	`11`	`0`
`12`	`12`	`0`
`13`	`13`	`Point 2 :`
`14`		`-237.233`
	`14`	`+-38.4341`
`15`	`15`	`0`
`16`	`16`	`0`
`17`	`17`	`0`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {`
`70`	`70`	`--status;`
`71`	`71`	`}`
`72`	`72`	`#ifdef _OPENMP`
`73`		`- opdi::logic->onMutexAcquired(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));`
	`73`	`+ opdi::logic->onMutexAcquired(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));`
`74`	`74`	`#endif`
`75`	`75`	`}`
`76`	`76`
`@@ -80,7 +80,7 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {`
`80`	`80`	`#endif`
`81`	`81`	`--status;`
`82`	`82`	`#ifdef _OPENMP`
`83`		`- opdi::logic->onMutexReleased(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));`
	`83`	`+ opdi::logic->onMutexReleased(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));`
`84`	`84`	`#endif`
`85`	`85`	`}`
`86`	`86`	`};`
`@@ -111,7 +111,7 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {`
`111`	`111`	`Base::job2(i, in, jobResults[i]);`
`112`	`112`
`113`	`113`	`mutex2.lock();`
`114`		`- out2 += jobResults[i];`
	`114`	`+ out2 *= jobResults[i];`
`115`	`115`	`mutex2.unlock();`
`116`	`116`	`}`
`117`	`117`	`}`