Merge pull request #1984 from rafbiels/rafbiels/cuda-stream-race-cond

Omar Ahmed · web-flow · commit cabf128094ef · 2024-08-19T16:20:45.000+01:00
Fix race condition in CUDA stream creation
diff --git a/source/adapters/cuda/queue.cpp b/source/adapters/cuda/queue.cpp
@@ -45,7 +45,8 @@ CUstream ur_queue_handle_t_::getNextComputeStream(uint32_t *StreamToken) {
       // change NumComputeStreams after that
       if (NumComputeStreams < ComputeStreams.size()) {
         UR_CHECK_ERROR(cuStreamCreateWithPriority(
-            &ComputeStreams[NumComputeStreams++], Flags, Priority));
+            &ComputeStreams[NumComputeStreams], Flags, Priority));
+        ++NumComputeStreams;
       }
     }
     Token = ComputeStreamIndex++;
@@ -110,7 +111,8 @@ CUstream ur_queue_handle_t_::getNextTransferStream() {
     // change NumTransferStreams after that
     if (NumTransferStreams < TransferStreams.size()) {
       UR_CHECK_ERROR(cuStreamCreateWithPriority(
-          &TransferStreams[NumTransferStreams++], Flags, Priority));
+          &TransferStreams[NumTransferStreams], Flags, Priority));
+      ++NumTransferStreams;
     }
   }
   uint32_t StreamI = TransferStreamIndex++ % TransferStreams.size();

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ CUstream ur_queue_handle_t_::getNextComputeStream(uint32_t *StreamToken) {`
`45`	`45`	`// change NumComputeStreams after that`
`46`	`46`	`if (NumComputeStreams < ComputeStreams.size()) {`
`47`	`47`	`UR_CHECK_ERROR(cuStreamCreateWithPriority(`
`48`		`- &ComputeStreams[NumComputeStreams++], Flags, Priority));`
	`48`	`+ &ComputeStreams[NumComputeStreams], Flags, Priority));`
	`49`	`+ ++NumComputeStreams;`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`	`Token = ComputeStreamIndex++;`
`@@ -110,7 +111,8 @@ CUstream ur_queue_handle_t_::getNextTransferStream() {`
`110`	`111`	`// change NumTransferStreams after that`
`111`	`112`	`if (NumTransferStreams < TransferStreams.size()) {`
`112`	`113`	`UR_CHECK_ERROR(cuStreamCreateWithPriority(`
`113`		`- &TransferStreams[NumTransferStreams++], Flags, Priority));`
	`114`	`+ &TransferStreams[NumTransferStreams], Flags, Priority));`
	`115`	`+ ++NumTransferStreams;`
`114`	`116`	`}`
`115`	`117`	`}`
`116`	`118`	`uint32_t StreamI = TransferStreamIndex++ % TransferStreams.size();`