Skip to content

Commit 7533a83

Browse files
Changes in ESIMD_CPU device interface definition
- Address of mutex is used for fetching mutex - Interface change is from PR#4011
1 parent 0151dc7 commit 7533a83

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

sycl/include/sycl/ext/intel/experimental/esimd/detail/memory_intrin.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -850,13 +850,13 @@ __esimd_media_block_load(unsigned modififer, TACC handle, unsigned plane,
850850
uint32_t bpp;
851851
uint32_t imgWidth;
852852
uint32_t imgHeight;
853-
std::mutex mutexLock;
853+
std::mutex *mutexLock;
854854

855855
I->sycl_get_cm_image_params_ptr(static_cast<void *>(handle.get_pointer()),
856856
&readBase, &imgWidth, &imgHeight, &bpp,
857857
&mutexLock);
858858

859-
std::unique_lock<std::mutex> lock(mutexLock);
859+
std::unique_lock<std::mutex> lock(*mutexLock);
860860

861861
int x_pos_a, y_pos_a, offset, index;
862862

@@ -960,7 +960,7 @@ inline void __esimd_media_block_store(unsigned modififer, TACC handle,
960960
uint32_t bpp;
961961
uint32_t imgWidth;
962962
uint32_t imgHeight;
963-
std::mutex mutexLock;
963+
std::mutex *mutexLock;
964964

965965
I->sycl_get_cm_image_params_ptr(static_cast<void *>(handle.get_pointer()),
966966
&writeBase, &imgWidth, &imgHeight, &bpp,
@@ -974,7 +974,7 @@ inline void __esimd_media_block_store(unsigned modififer, TACC handle,
974974
// TODO : Remove intermediate 'out' matrix
975975
std::vector<std::vector<Ty>> out(M, std::vector<Ty>(N));
976976

977-
std::unique_lock<std::mutex> lock(mutexLock);
977+
std::unique_lock<std::mutex> lock(*mutexLock);
978978

979979
for (int i = 0, k = 0; i < M; i++) {
980980
for (int j = 0; j < N; j++) {
@@ -1342,12 +1342,12 @@ __esimd_block_read(SurfIndAliasTy surf_ind, uint32_t offset) {
13421342

13431343
char *readBase;
13441344
uint32_t width;
1345-
std::mutex mutexLock;
1345+
std::mutex *mutexLock;
13461346

13471347
I->sycl_get_cm_buffer_params_ptr(static_cast<void *>(surf_ind.get_pointer()),
13481348
&readBase, &width, &mutexLock);
13491349

1350-
std::unique_lock<std::mutex> lock(mutexLock);
1350+
std::unique_lock<std::mutex> lock(*mutexLock);
13511351

13521352
for (int idx = 0; idx < N; idx++) {
13531353
if (offset >= width) {
@@ -1369,12 +1369,12 @@ inline void __esimd_block_write(SurfIndAliasTy surf_ind, uint32_t offset,
13691369

13701370
char *writeBase;
13711371
uint32_t width;
1372-
std::mutex mutexLock;
1372+
std::mutex *mutexLock;
13731373

13741374
I->sycl_get_cm_buffer_params_ptr(static_cast<void *>(surf_ind.get_pointer()),
13751375
&writeBase, &width, &mutexLock);
13761376

1377-
std::unique_lock<std::mutex> lock(mutexLock);
1377+
std::unique_lock<std::mutex> lock(*mutexLock);
13781378

13791379
offset <<= 4;
13801380

0 commit comments

Comments
 (0)