Optimize function that loads pointers on GPU#3001
Conversation
Avoid constructing temporary std::vector when converting NVTEBasicTensor to SimpleTensor. Avoid string operations in multi-tensor swizzle. Avoid temporary std::vector when checking scale tensors. Signed-off-by: Tim Moon <tmoon@nvidia.com>
Tensor::shape() returns a std::vector<size_t> by value, allocating on the heap. flat_first_dim and flat_last_dim only need to walk the dims, so the allocation was pure overhead in hot paths. Introduce Tensor::compute_shape() returning an NVTEShape (fixed inline buffer, no heap) as the single source of truth for the format-dependent shape logic. shape() is now a thin std::vector wrapper around it for callers that want a vector; flat_first_dim and flat_last_dim call compute_shape() directly. Signed-off-by: Tim Moon <tmoon@nvidia.com> Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
flat_first_dim() and flat_last_dim() each called compute_shape() independently. flat_2d_dims() computes both in a single pass; the scalar helpers now delegate to it. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
Replace all paired flat_first_dim() + flat_last_dim() calls on the same tensor with a single flat_2d_dims() call. Saves one compute_shape() per tensor in CheckScaleTensorShape, the multi-tensor swizzle loop, and various cast/GEMM dispatch paths. Also adds reserve() to the local vectors in nvte_multi_tensor_swizzle_scaling_factors to avoid reallocation. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
Signed-off-by: Tim Moon <tmoon@nvidia.com>
Replace the inline swizzle implementation with a call to multi_tensor_swizzle_scales_for_gemm, which has identical logic (16B-aligned contiguous output buffer, TensorWrapper construction, nvte_multi_tensor_swizzle_scaling_factors kernel). Swizzled pointers are read back from the updated TensorWrappers after the call. Add reserve() to vectors in multi_tensor_swizzle_scales_for_gemm_impl now that this function is on the hot path for get_device_pointer_for_data_and_scales. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
Signed-off-by: Tim Moon <tmoon@nvidia.com>
Signed-off-by: Tim Moon <tmoon@nvidia.com>
Greptile SummaryThis PR refactors and optimizes the function that loads tensor pointers onto the GPU, achieving a 2× reduction in per-call CPU latency (~70 µs → ~31 µs). The optimizations eliminate heap allocations and mutex acquisitions by replacing
Confidence Score: 5/5The refactoring is safe to merge — the core math for scale shape validation is provably equivalent to the old code, the new kernel correctly handles partial-vector tail bytes, and all existing call sites use uniformly-shaped tensors. The changes are a well-scoped performance refactoring with no regressions in the core compute paths. The only non-trivial concerns are style-level: the per-tensor index was dropped from batch-validation error messages, and the uniform shape contract in transform_and_copy_data_ptrs_to_device is documented by naming convention but not enforced at runtime. Neither affects correctness for the current callers. transformer_engine/pytorch/csrc/extensions/utils.cpp — the uniform-shape assumption for scale tensors should ideally be validated at runtime rather than relying solely on the transform-type name to communicate the contract. Important Files Changed
Sequence DiagramsequenceDiagram
participant PY as Python (forward/backward MLP)
participant TEX as tex (pybind)
participant CPP as C++ utils.cpp
participant KERN as CUDA Kernels
PY->>TEX: copy_data_ptrs_to_device(data_tensors, device)
TEX->>CPP: collect uint64_t ptrs on host
CPP->>KERN: nvte_copy_host_to_device_via_kernel (via kernel args)
KERN-->>CPP: ptrs written to device buffer
CPP-->>PY: ptrs_device (at::Tensor)
PY->>TEX: transform_and_copy_data_ptrs_to_device("uniform_mxfp8_rowwise_swizzle", scales, device)
TEX->>CPP: create MultiTensorWrapper (batch alloc, 1 mutex acquire)
CPP->>KERN: nvte_multi_tensor_swizzle_scaling_factors
KERN-->>CPP: swizzled_scales written to device buffer
CPP->>KERN: nvte_copy_host_to_device_via_kernel (swizzled scale ptrs)
KERN-->>CPP: ptrs written to device buffer
CPP-->>PY: (ptrs_device, swizzled_scales buffer)
PY->>KERN: GEMM kernel (reads data via ptrs_device, scales via swizzled scale ptrs)
Reviews (10): Last reviewed commit: "Merge branch 'main' into tmoon/optimize-..." | Re-trigger Greptile |
| NVTE_CHECK(data_tensors[0].is_cuda(), "data_tensors must be on CUDA."); | ||
| const auto device = data_tensors[0].device(); | ||
| auto stream = at::cuda::getCurrentCUDAStream(); | ||
| std::tuple<at::Tensor, std::optional<at::Tensor>> transform_and_load_data_ptrs_on_device( |
There was a problem hiding this comment.
I'm not committed to this name. I based it on std::transform. I suppose "map" would be more Python-focused, but that sounds worse.
- Use size_t in kernel tail loop (was int64_t)
- Zero-initialize Payload before memcpy (Payload{})
- Rename Payload members to kMaxBytes/kVectorSize/kMaxVectors (linter)
- Consistent at::empty shape pattern: {static_cast<int64_t>(N)}
- Drop intermediate swizzled_scales_bytes variable
- Add comment explaining uniform-stride assumption in
transform_and_load_data_ptrs_on_device
- Rename sfb_buffer -> _sfb_buffer (keepalive, not directly used)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Tim Moon <tmoon@nvidia.com>
Signed-off-by: Tim Moon <tmoon@nvidia.com>
7946e5d to
48cc585
Compare
|
/te-ci |
|
Seems a lot of those changes would basically not be needed if we did not use the std::vector in Tensor/SimpleTensor and just used NVTEShape everywhere - this would effectively make SimpleTensor and NVTEBasicTensor the same thing (we could even do the constructor in the public header, just behing the |
vthumbe1503
left a comment
There was a problem hiding this comment.
Thanks for cleaning up the APIs. Looks much nicer now. CPU overheads being caused by heap allocations of shape, makes me wonder whether we should revive this PR to standardize on NVTEShape yo avoid back and forth between vector<size_t> and NVTE_Shape
| fc2_sfb_ptrs, _fc2_sfb_buffer = tex.transform_and_load_data_ptrs_on_device( | ||
| "uniform_mxfp8_columnwise_swizzle", | ||
| [w._columnwise_scale_inv for w in grouped_fc2_weight], | ||
| swizzle=True, | ||
| rowwise=False, | ||
| data_dtype=grouped_fc2_weight[0]._fp8_dtype, | ||
| device, |
There was a problem hiding this comment.
The other optimization can be to load both fc1 and fc2 data and scale inv togegther at the start of backward. I am hoping it wouldnt make the code ugly.
| SimpleTensor() : SimpleTensor(nullptr, std::vector<size_t>{0}, DType::kFloat32) {} | ||
| SimpleTensor &operator=(const NVTEBasicTensor &tensor) { | ||
| dptr = tensor.data_ptr; | ||
| shape.assign(tensor.shape.data, tensor.shape.data + tensor.shape.ndim); |
There was a problem hiding this comment.
So when you say heap allocations being done redundantly again and again. Do you mean the vector to NVTEShape conversions?
I rememember this problem being observed even with a basic te linear profiling. And I hadnt gotten this PR merged.
#2514
which essentially standadizes to use NVTEShape everywhere instead of using vector at all to avoid bouncing back and forth between the two allocations. Maybe it might be worth to revive the PR?
There was a problem hiding this comment.
Previously, assigning an NVTEBasicTensor to a SimpleTensor would trigger the constructor and then the move operator. This would allocate an std::vector, move it, and deallocate the old std::vector.
One other approach I was thinking about was implementing a Shape class that wraps around NVTEShape and has a similar API as std::vector. That way we can keep the nice ergonomics, while avoiding heap allocations.
There was a problem hiding this comment.
I had tried your other approach in the 2514 PR above, but eventually had removed it due to some complications. I have refer back to my notes on why it didnt work out for me.
But here is the commit that reverted it
b599776
I had called it NVTEShapeWrapper and implemented all the vector based APIs.
There was a problem hiding this comment.
One complication I do remember was to change a lot of attention interfaces to have NVTEShapeWrapper instead of using vector.
There was a problem hiding this comment.
I've found that adding a cast operator to std::vector helps reduce the number of places we need to change the interfaces.
Provides a std::vector<size_t>-like interface around NVTEShape without heap allocation, used as the return type of Tensor::shape() in place of the previous std::vector. Disambiguate cute::Shape from transformer_engine::Shape in the hadamard_transform kernels. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
Store shape in Shape class rather than std::vector. Signed-off-by: Tim Moon <tmoon@nvidia.com>
for more information, see https://pre-commit.ci
|
/te-ci |
Signed-off-by: Tim Moon <tmoon@nvidia.com>
Expose nvte_create_tensors and nvte_destroy_tensors so multi-tensor callers can amortize the TensorAllocator mutex across N tensors instead of locking once per call. nvte_destroy_tensors was already defined internally but not declared in the public header. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
…evice The uniform swizzle path constructed 2N TensorWrappers and then extracted their raw NVTETensors into separate vectors. Replace with a single 2N nvte_create_tensors call into one contiguous buffer (inputs in the first half, outputs in the second), an RAII guard for nvte_destroy_tensors, and a local set_param lambda for the setters. Drops the separate pack pass and reduces the allocator mutex acquisitions from 4N to 2 per call. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
Signed-off-by: Tim Moon <tmoon@nvidia.com>
for more information, see https://pre-commit.ci
|
/te-ci |
| transformer_engine::DType data_dtype, scale_dtype; | ||
| switch (scaling_mode) { | ||
| case NVTE_MXFP8_1D_SCALING: | ||
| data_dtype = transformer_engine::DType::kFloat8E4M3; |
There was a problem hiding this comment.
Do we really want to hardcode data_dtype = kFloat8E4M3 here?
There was a problem hiding this comment.
We don't actually access the fp8e4m3 values when swizzling, this is a fake configuration so the tensor passes validation checks.
Signed-off-by: Tim Moon <tmoon@nvidia.com>
string_view is already a (ptr, len) reference — passing by const-ref adds an indirection without benefit. Matches the C++ Core Guidelines F.16 recommendation. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
|
/te-ci |
| return max_smem; | ||
| return max_smem; | ||
| }; | ||
| static int cached_val = query_max_smem(); |
There was a problem hiding this comment.
This is nice but wrong - we need to be able to support this value per GPU rather than a single global, similarly to the other CUDA properties that we have in the CUDA runtime helpers (also, this function should live together with those other functions).
There was a problem hiding this comment.
Updated to handle the multi-device case.
| check_scale_inv_shapes); | ||
| CheckInputTensor(*output[i], "scaling_factor_output[" + std::to_string(i) + "]", | ||
| check_scale_inv_shapes); | ||
| CheckInputTensor(*input[i], "scaling_factor_input", check_scale_inv_shapes); |
There was a problem hiding this comment.
This is making the error quality worse. I think the better approach would be to have a version of this function that still performs this string concatenation, but does so only when we actually want to raise an error.
There was a problem hiding this comment.
I guess we could implement the Check*Tensor functions with variadic templates and unpack the args in NVTE_CHECK. Alternatively we could pass in a closure that creates the name. These seem overkill though. Both approaches seem excessive for what should be a quick sanity check.
| transformer_engine::DType scale_dtype; | ||
| if (is_fp8_dtype(data_dtype)) { | ||
| // Swizzle scales for GEMM, with uniform tensor sizes | ||
| const bool uniform_mxfp8_rowwise_swizzle = transform_type == "uniform_mxfp8_rowwise_swizzle"; |
There was a problem hiding this comment.
If we want to make it possibly the fastest while still using strings, we should start the strings with the things that are different, rather than start with the "uniform_" part that will be the same in every case (and therefore the loop that this will become will need to go over that part every time no matter what).
Expand internal usage of Shape class. Zero-initialize in Shape::resize. Make sure dynamic smem querying is per-device. Reuse logic for batched and single tensor alloc/dealloc. Signed-off-by: Tim Moon <tmoon@nvidia.com>
Thin RAII wrapper around a batched nvte_create_tensors / nvte_destroy_tensors pair, with operator[], data(), iteration, and implicit conversion to NVTETensor* for multi-tensor C APIs. Replaces the ad-hoc DestroyGuard struct used at each call site in recipe.cpp, swizzle.cpp, and utils.cpp. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Tim Moon <tmoon@nvidia.com>
for more information, see https://pre-commit.ci
|
/te-ci |
Description
tex.get_device_pointer_for_data_and_scaleshas two problems:ints. But actually it takes the buffers from multiple MXFP8/NVFP4 tensors (all assumed to have the same shape), swizzles the scaling factors, and transfers the pointers to a GPU array in a CUDA Graph-friendly way.This PR makes several optimizations to reduce CPU overhead, mostly by avoiding heap allocations and mutex acquisition. I've also attempted to make the functionality more general and logical:
nvte_copy_host_to_device_via_kernel_args: A general function for copying a small amount of data to GPU in a CUDA Graph-friendly way. Unlikenvte_convert_pointers_to_tensor, it makes no assumptions that the data is a list of pointers.tex.copy_data_ptrs_to_device: Takes a list of tensors and puts their data pointers into a GPU buffer.tex.transform_and_copy_data_ptrs_to_device: Performs a user-specified transform on a list of tensors and puts the resulting data pointers into a GPU buffer. Currently it only supports scale swizzles on uniformly shaped tensors, but the transform names help make the contracts explicit.With these changes, per-call CPU runtime has dropped from 70 us to 31 us on a GB200 node.
This is progress toward #2897.
Type of change
Changes
transformer_engine::Tensor::flat_2d_dimsto compute first and last dims simultaneouslynvte_load_value_on_devicetex.load_data_ptrs_on_deviceandtex.transform_and_load_data_ptrs_on_deviceNVTEShapewith similar API asstd::vectortransformer_engine::SimpleTensortransformer_engine::Tensorshape functionsChecklist: