|
| 1 | +From 1898944000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Daniel Juenger <sleeepyjack@users.noreply.github.com> |
| 3 | +Date: Mon, 14 Apr 2026 00:00:00 +0000 |
| 4 | +Subject: [PATCH] Fix codegen in 128bit atomic CAS (#8403) |
| 5 | + |
| 6 | +Fix wrong inline asm operand indices in all atom.cas.*.b128 variants. |
| 7 | +See https://github.com/NVIDIA/cccl/issues/8402 |
| 8 | +--- |
| 9 | + .../cuda/std/__atomic/functions/cuda_ptx_generated.h | 80 ++++++++++---------- |
| 10 | + 1 file changed, 40 insertions(+), 40 deletions(-) |
| 11 | + |
| 12 | +diff --git a/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h b/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h |
| 13 | +index f3e30d53039..479815f4136 100644 |
| 14 | +--- a/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h |
| 15 | ++++ b/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h |
| 16 | +@@ -1585,8 +1585,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 17 | + { |
| 18 | + .reg .b128 _d; |
| 19 | + .reg .b128 _v; |
| 20 | +- mov.b128 _d, {%0, %1}; |
| 21 | +- mov.b128 _v, {%4, %5}; |
| 22 | ++ mov.b128 _d, {%3, %4}; |
| 23 | ++ mov.b128 _v, {%5, %6}; |
| 24 | + atom.cas.acquire.cta.b128 _d,[%2],_d,_v; |
| 25 | + mov.b128 {%0, %1}, _d; |
| 26 | + } |
| 27 | +@@ -1604,8 +1604,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 28 | + { |
| 29 | + .reg .b128 _d; |
| 30 | + .reg .b128 _v; |
| 31 | +- mov.b128 _d, {%0, %1}; |
| 32 | +- mov.b128 _v, {%4, %5}; |
| 33 | ++ mov.b128 _d, {%3, %4}; |
| 34 | ++ mov.b128 _v, {%5, %6}; |
| 35 | + atom.cas.acquire.cluster.b128 _d,[%2],_d,_v; |
| 36 | + mov.b128 {%0, %1}, _d; |
| 37 | + } |
| 38 | +@@ -1623,8 +1623,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 39 | + { |
| 40 | + .reg .b128 _d; |
| 41 | + .reg .b128 _v; |
| 42 | +- mov.b128 _d, {%0, %1}; |
| 43 | +- mov.b128 _v, {%4, %5}; |
| 44 | ++ mov.b128 _d, {%3, %4}; |
| 45 | ++ mov.b128 _v, {%5, %6}; |
| 46 | + atom.cas.acquire.gpu.b128 _d,[%2],_d,_v; |
| 47 | + mov.b128 {%0, %1}, _d; |
| 48 | + } |
| 49 | +@@ -1642,8 +1642,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 50 | + { |
| 51 | + .reg .b128 _d; |
| 52 | + .reg .b128 _v; |
| 53 | +- mov.b128 _d, {%0, %1}; |
| 54 | +- mov.b128 _v, {%4, %5}; |
| 55 | ++ mov.b128 _d, {%3, %4}; |
| 56 | ++ mov.b128 _v, {%5, %6}; |
| 57 | + atom.cas.acquire.sys.b128 _d,[%2],_d,_v; |
| 58 | + mov.b128 {%0, %1}, _d; |
| 59 | + } |
| 60 | +@@ -1661,8 +1661,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 61 | + { |
| 62 | + .reg .b128 _d; |
| 63 | + .reg .b128 _v; |
| 64 | +- mov.b128 _d, {%0, %1}; |
| 65 | +- mov.b128 _v, {%4, %5}; |
| 66 | ++ mov.b128 _d, {%3, %4}; |
| 67 | ++ mov.b128 _v, {%5, %6}; |
| 68 | + atom.cas.relaxed.cta.b128 _d,[%2],_d,_v; |
| 69 | + mov.b128 {%0, %1}, _d; |
| 70 | + } |
| 71 | +@@ -1680,8 +1680,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 72 | + { |
| 73 | + .reg .b128 _d; |
| 74 | + .reg .b128 _v; |
| 75 | +- mov.b128 _d, {%0, %1}; |
| 76 | +- mov.b128 _v, {%4, %5}; |
| 77 | ++ mov.b128 _d, {%3, %4}; |
| 78 | ++ mov.b128 _v, {%5, %6}; |
| 79 | + atom.cas.relaxed.cluster.b128 _d,[%2],_d,_v; |
| 80 | + mov.b128 {%0, %1}, _d; |
| 81 | + } |
| 82 | +@@ -1699,8 +1699,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 83 | + { |
| 84 | + .reg .b128 _d; |
| 85 | + .reg .b128 _v; |
| 86 | +- mov.b128 _d, {%0, %1}; |
| 87 | +- mov.b128 _v, {%4, %5}; |
| 88 | ++ mov.b128 _d, {%3, %4}; |
| 89 | ++ mov.b128 _v, {%5, %6}; |
| 90 | + atom.cas.relaxed.gpu.b128 _d,[%2],_d,_v; |
| 91 | + mov.b128 {%0, %1}, _d; |
| 92 | + } |
| 93 | +@@ -1718,8 +1718,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 94 | + { |
| 95 | + .reg .b128 _d; |
| 96 | + .reg .b128 _v; |
| 97 | +- mov.b128 _d, {%0, %1}; |
| 98 | +- mov.b128 _v, {%4, %5}; |
| 99 | ++ mov.b128 _d, {%3, %4}; |
| 100 | ++ mov.b128 _v, {%5, %6}; |
| 101 | + atom.cas.relaxed.sys.b128 _d,[%2],_d,_v; |
| 102 | + mov.b128 {%0, %1}, _d; |
| 103 | + } |
| 104 | +@@ -1737,8 +1737,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 105 | + { |
| 106 | + .reg .b128 _d; |
| 107 | + .reg .b128 _v; |
| 108 | +- mov.b128 _d, {%0, %1}; |
| 109 | +- mov.b128 _v, {%4, %5}; |
| 110 | ++ mov.b128 _d, {%3, %4}; |
| 111 | ++ mov.b128 _v, {%5, %6}; |
| 112 | + atom.cas.release.cta.b128 _d,[%2],_d,_v; |
| 113 | + mov.b128 {%0, %1}, _d; |
| 114 | + } |
| 115 | +@@ -1756,8 +1756,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 116 | + { |
| 117 | + .reg .b128 _d; |
| 118 | + .reg .b128 _v; |
| 119 | +- mov.b128 _d, {%0, %1}; |
| 120 | +- mov.b128 _v, {%4, %5}; |
| 121 | ++ mov.b128 _d, {%3, %4}; |
| 122 | ++ mov.b128 _v, {%5, %6}; |
| 123 | + atom.cas.release.cluster.b128 _d,[%2],_d,_v; |
| 124 | + mov.b128 {%0, %1}, _d; |
| 125 | + } |
| 126 | +@@ -1775,8 +1775,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 127 | + { |
| 128 | + .reg .b128 _d; |
| 129 | + .reg .b128 _v; |
| 130 | +- mov.b128 _d, {%0, %1}; |
| 131 | +- mov.b128 _v, {%4, %5}; |
| 132 | ++ mov.b128 _d, {%3, %4}; |
| 133 | ++ mov.b128 _v, {%5, %6}; |
| 134 | + atom.cas.release.gpu.b128 _d,[%2],_d,_v; |
| 135 | + mov.b128 {%0, %1}, _d; |
| 136 | + } |
| 137 | +@@ -1794,8 +1794,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 138 | + { |
| 139 | + .reg .b128 _d; |
| 140 | + .reg .b128 _v; |
| 141 | +- mov.b128 _d, {%0, %1}; |
| 142 | +- mov.b128 _v, {%4, %5}; |
| 143 | ++ mov.b128 _d, {%3, %4}; |
| 144 | ++ mov.b128 _v, {%5, %6}; |
| 145 | + atom.cas.release.sys.b128 _d,[%2],_d,_v; |
| 146 | + mov.b128 {%0, %1}, _d; |
| 147 | + } |
| 148 | +@@ -1813,8 +1813,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 149 | + { |
| 150 | + .reg .b128 _d; |
| 151 | + .reg .b128 _v; |
| 152 | +- mov.b128 _d, {%0, %1}; |
| 153 | +- mov.b128 _v, {%4, %5}; |
| 154 | ++ mov.b128 _d, {%3, %4}; |
| 155 | ++ mov.b128 _v, {%5, %6}; |
| 156 | + atom.cas.acq_rel.cta.b128 _d,[%2],_d,_v; |
| 157 | + mov.b128 {%0, %1}, _d; |
| 158 | + } |
| 159 | +@@ -1832,8 +1832,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 160 | + { |
| 161 | + .reg .b128 _d; |
| 162 | + .reg .b128 _v; |
| 163 | +- mov.b128 _d, {%0, %1}; |
| 164 | +- mov.b128 _v, {%4, %5}; |
| 165 | ++ mov.b128 _d, {%3, %4}; |
| 166 | ++ mov.b128 _v, {%5, %6}; |
| 167 | + atom.cas.acq_rel.cluster.b128 _d,[%2],_d,_v; |
| 168 | + mov.b128 {%0, %1}, _d; |
| 169 | + } |
| 170 | +@@ -1851,8 +1851,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 171 | + { |
| 172 | + .reg .b128 _d; |
| 173 | + .reg .b128 _v; |
| 174 | +- mov.b128 _d, {%0, %1}; |
| 175 | +- mov.b128 _v, {%4, %5}; |
| 176 | ++ mov.b128 _d, {%3, %4}; |
| 177 | ++ mov.b128 _v, {%5, %6}; |
| 178 | + atom.cas.acq_rel.gpu.b128 _d,[%2],_d,_v; |
| 179 | + mov.b128 {%0, %1}, _d; |
| 180 | + } |
| 181 | +@@ -1870,8 +1870,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 182 | + { |
| 183 | + .reg .b128 _d; |
| 184 | + .reg .b128 _v; |
| 185 | +- mov.b128 _d, {%0, %1}; |
| 186 | +- mov.b128 _v, {%4, %5}; |
| 187 | ++ mov.b128 _d, {%3, %4}; |
| 188 | ++ mov.b128 _v, {%5, %6}; |
| 189 | + atom.cas.acq_rel.sys.b128 _d,[%2],_d,_v; |
| 190 | + mov.b128 {%0, %1}, _d; |
| 191 | + } |
| 192 | +@@ -1889,8 +1889,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 193 | + { |
| 194 | + .reg .b128 _d; |
| 195 | + .reg .b128 _v; |
| 196 | +- mov.b128 _d, {%0, %1}; |
| 197 | +- mov.b128 _v, {%4, %5}; |
| 198 | ++ mov.b128 _d, {%3, %4}; |
| 199 | ++ mov.b128 _v, {%5, %6}; |
| 200 | + atom.cas.cta.b128 _d,[%2],_d,_v; |
| 201 | + mov.b128 {%0, %1}, _d; |
| 202 | + } |
| 203 | +@@ -1908,8 +1908,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 204 | + { |
| 205 | + .reg .b128 _d; |
| 206 | + .reg .b128 _v; |
| 207 | +- mov.b128 _d, {%0, %1}; |
| 208 | +- mov.b128 _v, {%4, %5}; |
| 209 | ++ mov.b128 _d, {%3, %4}; |
| 210 | ++ mov.b128 _v, {%5, %6}; |
| 211 | + atom.cas.cluster.b128 _d,[%2],_d,_v; |
| 212 | + mov.b128 {%0, %1}, _d; |
| 213 | + } |
| 214 | +@@ -1927,8 +1927,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 215 | + { |
| 216 | + .reg .b128 _d; |
| 217 | + .reg .b128 _v; |
| 218 | +- mov.b128 _d, {%0, %1}; |
| 219 | +- mov.b128 _v, {%4, %5}; |
| 220 | ++ mov.b128 _d, {%3, %4}; |
| 221 | ++ mov.b128 _v, {%5, %6}; |
| 222 | + atom.cas.gpu.b128 _d,[%2],_d,_v; |
| 223 | + mov.b128 {%0, %1}, _d; |
| 224 | + } |
| 225 | +@@ -1946,8 +1946,8 @@ static inline _CCCL_DEVICE bool __cuda_atomic_compare_exchange( |
| 226 | + { |
| 227 | + .reg .b128 _d; |
| 228 | + .reg .b128 _v; |
| 229 | +- mov.b128 _d, {%0, %1}; |
| 230 | +- mov.b128 _v, {%4, %5}; |
| 231 | ++ mov.b128 _d, {%3, %4}; |
| 232 | ++ mov.b128 _v, {%5, %6}; |
| 233 | + atom.cas.sys.b128 _d,[%2],_d,_v; |
| 234 | + mov.b128 {%0, %1}, _d; |
| 235 | + } |
| 236 | +-- |
| 237 | +2.45.2 |
| 238 | + |
0 commit comments