Merge pull request #217 from spacemeshos/use-global-mtx-for-gpu-access

Use one mutex for any Device besides CPU
spacemeshos · Aug 12, 2023 · 2356d00 · 2356d00
2 parents 6b2fd63 + 9031fda
commit 2356d00
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 78 deletions.
diff --git a/internal/postrs/api.go b/internal/postrs/api.go
@@ -134,13 +134,14 @@ func NewScrypt(opts ...OptionFunc) (*Scrypt, error) {
 		return nil, err
 	}
 
+	if *options.providerID != cCPUProviderID() {
+		gpuMtx.Lock()
+	}
 	init, err := cNewInitializer(options)
 	if err != nil {
+		gpuMtx.Unlock()
 		return nil, err
 	}
-	if *options.providerID != cCPUProviderID() {
-		gpuMtx.Device(*options.providerID).Lock()
-	}
 
 	return &Scrypt{
 		options: options,
@@ -156,7 +157,7 @@ func (s *Scrypt) Close() error {
 
 	cFreeInitializer(s.init)
 	if *s.options.providerID != cCPUProviderID() {
-		gpuMtx.Device(*s.options.providerID).Unlock()
+		gpuMtx.Unlock()
 	}
 	s.init = nil
 	return nil

diff --git a/internal/postrs/device_mutex.go b/internal/postrs/device_mutex.go
diff --git a/internal/postrs/device_mutex_test.go b/internal/postrs/device_mutex_test.go
diff --git a/internal/postrs/initializer.go b/internal/postrs/initializer.go
@@ -7,11 +7,12 @@ import "C"
 
 import (
 	"errors"
+	"sync"
 )
 
-// gpuMtx is an instance of deviceMutex that can be used to prevent concurrent calls
-// to the same GPU (by ProviderID) from multiple goroutines.
-var gpuMtx deviceMutex
+// gpuMtx is a mutual exclusion lock preventing concurrent access
+// to any GPU device. CPU can still be used concurrently.
+var gpuMtx sync.Mutex
 
 // DeviceClass is an enum for the type of device (CPU or GPU).
 type DeviceClass int