Merge pull request #1168 from Seanst98/sean/unique-addr-mode-per-dim-adapters

[Bindless][CUDA] Unique addressing modes per dimension

Author: kbenzie

source/adapters/cuda/image.cpp

@@ -239,29 +239,38 @@ ur_result_t urTextureCreate(ur_sampler_handle_t hSampler,
 
   try {
     /// pi_sampler_properties
+    /// Layout of UR samplers for CUDA
+    ///
+    /// Sampler property layout:
     /// |     <bits>     | <usage>
     /// -----------------------------------
-    /// |  31 30 ... 6   | N/A
-    /// |       5        | mip filter mode
-    /// |     4 3 2      | addressing mode
+    /// |  31 30 ... 12  | N/A
+    /// |       11       | mip filter mode
+    /// |    10 9 8      | addressing mode 3
+    /// |     7 6 5      | addressing mode 2
+    /// |     4 3 2      | addressing mode 1
     /// |       1        | filter mode
     /// |       0        | normalize coords
     CUDA_TEXTURE_DESC ImageTexDesc = {};
-    CUaddress_mode AddrMode = {};
-    ur_sampler_addressing_mode_t AddrModeProp = hSampler->getAddressingMode();
-    if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE -
-                         UR_SAMPLER_ADDRESSING_MODE_NONE)) {
-      AddrMode = CU_TR_ADDRESS_MODE_CLAMP;
-    } else if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_CLAMP -
-                                UR_SAMPLER_ADDRESSING_MODE_NONE)) {
-      AddrMode = CU_TR_ADDRESS_MODE_BORDER;
-    } else if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_REPEAT -
-                                UR_SAMPLER_ADDRESSING_MODE_NONE)) {
-      AddrMode = CU_TR_ADDRESS_MODE_WRAP;
-    } else if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT -
-                                UR_SAMPLER_ADDRESSING_MODE_NONE)) {
-      AddrMode = CU_TR_ADDRESS_MODE_MIRROR;
+    CUaddress_mode AddrMode[3];
+    for (size_t i = 0; i < 3; i++) {
+      ur_sampler_addressing_mode_t AddrModeProp =
+          hSampler->getAddressingModeDim(i);
+      if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE -
+                           UR_SAMPLER_ADDRESSING_MODE_NONE)) {
+        AddrMode[i] = CU_TR_ADDRESS_MODE_CLAMP;
+      } else if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_CLAMP -
+                                  UR_SAMPLER_ADDRESSING_MODE_NONE)) {
+        AddrMode[i] = CU_TR_ADDRESS_MODE_BORDER;
+      } else if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_REPEAT -
+                                  UR_SAMPLER_ADDRESSING_MODE_NONE)) {
+        AddrMode[i] = CU_TR_ADDRESS_MODE_WRAP;
+      } else if (AddrModeProp == (UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT -
+                                  UR_SAMPLER_ADDRESSING_MODE_NONE)) {
+        AddrMode[i] = CU_TR_ADDRESS_MODE_MIRROR;
+      }
     }
+
     CUfilter_mode FilterMode;
     ur_sampler_filter_mode_t FilterModeProp = hSampler->getFilterMode();
     FilterMode =
@@ -278,14 +287,15 @@ ur_result_t urTextureCreate(ur_sampler_handle_t hSampler,
     ImageTexDesc.minMipmapLevelClamp = hSampler->MinMipmapLevelClamp;
     ImageTexDesc.maxAnisotropy = static_cast<unsigned>(hSampler->MaxAnisotropy);
 
-    // The address modes can interfere with other dimensionsenqueueEventsWait
+    // The address modes can interfere with other dimensions
     // e.g. 1D texture sampling can be interfered with when setting other
     // dimension address modes despite their nonexistence.
-    ImageTexDesc.addressMode[0] = AddrMode; // 1D
-    ImageTexDesc.addressMode[1] =
-        pImageDesc->height > 0 ? AddrMode : ImageTexDesc.addressMode[1]; // 2D
+    ImageTexDesc.addressMode[0] = AddrMode[0]; // 1D
+    ImageTexDesc.addressMode[1] = pImageDesc->height > 0
+                                      ? AddrMode[1]
+                                      : ImageTexDesc.addressMode[1]; // 2D
     ImageTexDesc.addressMode[2] =
-        pImageDesc->depth > 0 ? AddrMode : ImageTexDesc.addressMode[2]; // 3D
+        pImageDesc->depth > 0 ? AddrMode[2] : ImageTexDesc.addressMode[2]; // 3D
 
     // flags takes the normalized coordinates setting -- unnormalized is default
     ImageTexDesc.flags = (hSampler->isNormalizedCoords())

source/adapters/cuda/sampler.cpp

@@ -37,7 +37,13 @@ urSamplerCreate(ur_context_handle_t hContext, const ur_sampler_desc_t *pDesc,
       Sampler->MaxMipmapLevelClamp = SamplerMipProperties->maxMipmapLevelClamp;
       Sampler->MinMipmapLevelClamp = SamplerMipProperties->minMipmapLevelClamp;
       Sampler->MaxAnisotropy = SamplerMipProperties->maxAnisotropy;
-      Sampler->Props |= SamplerMipProperties->mipFilterMode << 5;
+      Sampler->Props |= SamplerMipProperties->mipFilterMode << 11;
+    } else if (BaseDesc->stype == UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES) {
+      const ur_exp_sampler_addr_modes_t *SamplerAddrModes =
+          reinterpret_cast<const ur_exp_sampler_addr_modes_t *>(pNext);
+      Sampler->Props |= SamplerAddrModes->addrModes[0] << 2;
+      Sampler->Props |= SamplerAddrModes->addrModes[1] << 5;
+      Sampler->Props |= SamplerAddrModes->addrModes[2] << 8;
     }
     pNext = const_cast<void *>(BaseDesc->pNext);
   }

source/adapters/cuda/sampler.hpp

@@ -15,9 +15,11 @@
 /// Sampler property layout:
 /// |     <bits>     | <usage>
 /// -----------------------------------
-/// |  31 30 ... 6   | N/A
-/// |       5        | mip filter mode
-/// |     4 3 2      | addressing mode
+/// |  31 30 ... 12  | N/A
+/// |       11       | mip filter mode
+/// |    10 9 8      | addressing mode 3
+/// |     7 6 5      | addressing mode 2
+/// |     4 3 2      | addressing mode 1
 /// |       1        | filter mode
 /// |       0        | normalize coords
 struct ur_sampler_handle_t_ {
@@ -50,7 +52,12 @@ struct ur_sampler_handle_t_ {
     return static_cast<ur_sampler_addressing_mode_t>((Props >> 2) & 0b111);
   }
 
+  ur_sampler_addressing_mode_t getAddressingModeDim(size_t i) const noexcept {
+    return static_cast<ur_sampler_addressing_mode_t>((Props >> (2 + (i * 3))) &
+                                                     0b111);
+  }
+
   ur_sampler_filter_mode_t getMipFilterMode() const noexcept {
-    return static_cast<ur_sampler_filter_mode_t>((Props >> 5) & 0b1);
+    return static_cast<ur_sampler_filter_mode_t>((Props >> 11) & 0b1);
   }
 };