Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/tensorrt_llm/kernels/fusedCatFp4.cu
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ __global__ __launch_bounds__(WARP_SIZE* ROWS_PER_BLOCK) void fusedCatFp4Kernel(i
uint8_t byte1 = static_cast<uint8_t>(c2 | (c3 << 4));

// ---- Stage 6: Store packed bytes (2 bytes per lane) ----
int base_out = row * (HEAD_DIM / 2) + lane * 2;
int64_t const base_out = static_cast<int64_t>(row) * (HEAD_DIM / 2) + lane * 2;
packed_out[base_out + 0] = static_cast<int8_t>(byte0);
packed_out[base_out + 1] = static_cast<int8_t>(byte1);

Expand Down
2 changes: 1 addition & 1 deletion cpp/tensorrt_llm/kernels/fusedCatFp8.cu
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ __global__ __launch_bounds__(WARP_SIZE* ROWS_PER_BLOCK) void fusedCatFp8Kernel(_
packed.fp8[2] = quantize(v2);
packed.fp8[3] = quantize(v3);

int base_out = row * HEAD_DIM + lane * ELEMS_PER_THREAD;
int64_t const base_out = static_cast<int64_t>(row) * HEAD_DIM + lane * ELEMS_PER_THREAD;
*reinterpret_cast<uint32_t*>(fp8_out + base_out) = packed.u32;

if (lane == 0)
Expand Down
18 changes: 14 additions & 4 deletions cpp/tensorrt_llm/kernels/moe/trtllmGen/runner.cu
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <tensorrt_llm/common/assert.h>
#include <tensorrt_llm/common/envUtils.h>

#include <algorithm>

TRTLLM_NAMESPACE_BEGIN

namespace kernels
Expand Down Expand Up @@ -495,7 +497,7 @@ void Runner::run(void* hiddenState, void* hiddenStateScale, void* weights, void*
int32_t numExperts, int32_t numTokens, int32_t* permutedIdxToTokenIdx, int32_t* ptrNumNonExitingCtas,
int32_t* ptrTotalNumPaddedTokens, int32_t* ptrCtaIdxXyToBatchIdx, int32_t* ptrCtaIdxXyToMnLimit,
void* bmm1Workspace, bool useRoutingScalesOnInput, int device, cudaStream_t stream, int32_t configIndex,
int32_t validHiddenSize, int32_t validIntermediateSize)
int32_t validHiddenSize, int32_t validIntermediateSize, int32_t maxNumCtasInBatchDim)
{
if (mDtypeWeights == btg::Dtype::MxE2m1 && mDtypeAct == btg::Dtype::MxE4m3)
{
Expand All @@ -506,6 +508,10 @@ void Runner::run(void* hiddenState, void* hiddenStateScale, void* weights, void*
validHiddenSize = tensorrt_llm::common::roundUp(validHiddenSize, 512);
}
auto maxNumCgasInBatchDim = Routing::getMaxNumCgasInBatchDim(numTokens, topK, numExperts, mTileTokensDim);
if (maxNumCtasInBatchDim > 0)
{
maxNumCgasInBatchDim = std::min(maxNumCgasInBatchDim, maxNumCtasInBatchDim);
}
bool is_gated_activation = tensorrt_llm::kernels::isGatedActType(mActType);
int32_t intermediateSizeFactor = (is_gated_activation ? 2 : 1);
mRunner.run(numTokens, intermediateSizeFactor * intermediateSize, hiddenSize, numTokens,
Expand Down Expand Up @@ -611,14 +617,18 @@ void Runner::run(void* permutedHiddenState, void* permutedHiddenStateScale, void
int32_t intermediateSize, int32_t numExperts, int32_t numTokens, int32_t* ptrNumNonExitingCtas,
int32_t* ptrTotalNumPaddedTokens, int32_t* ptrCtaIdxXyToBatchIdx, int32_t* ptrCtaIdxXyToMnLimit,
void* bmm2Workspace, int device, cudaStream_t stream, int32_t configIndex, int32_t validHiddenSize,
int32_t validIntermediateSize)
int32_t validIntermediateSize, int32_t maxNumCtasInBatchDim)
{
if (mDtypeWeights == btg::Dtype::MxE2m1 && mDtypeAct == btg::Dtype::MxE4m3)
{
// The multiple is no less than 128 as TMA requires it for CU_TENSOR_MAP_DATA_TYPE_16U4_ALIGN16B types
validIntermediateSize = tensorrt_llm::common::roundUp(validIntermediateSize, 128);
}
auto maxNumCgasInBatchDim = Routing::getMaxNumCgasInBatchDim(numTokens, topK, numExperts, mTileTokensDim);
if (maxNumCtasInBatchDim > 0)
{
maxNumCgasInBatchDim = std::min(maxNumCgasInBatchDim, maxNumCtasInBatchDim);
}
mRunner.run(numTokens, hiddenSize, intermediateSize, numTokens, validHiddenSize, validIntermediateSize, {},
numTokens, numExperts, maxNumCgasInBatchDim, permutedHiddenState, permutedHiddenStateScale, weights,
weightsScale, /* perTokensSfA */ nullptr,
Expand Down Expand Up @@ -869,7 +879,7 @@ void Runner::run(
workspace.cta_idx_xy_to_batch_idx, workspace.cta_idx_xy_to_mn_limit, workspace.bmm1_workspace,
args.mUseRoutingScalesOnInput, device, stream, config.gemm1Config,
args.valid_hidden_size.value_or(args.hidden_size),
args.valid_intermediate_size.value_or(args.intermediate_size));
args.valid_intermediate_size.value_or(args.intermediate_size), args.max_num_ctas_in_batch_dim);

// We do not fuse activation with FC1 for DeepSeek FP8 due to the weights shuffling constraint.
TLLM_CHECK_WITH_INFO(!args.skip_gemm2 || !args.do_finalize, "skip_gemm2 requires do_finalize == false.");
Expand All @@ -896,7 +906,7 @@ void Runner::run(
workspace.num_non_exiting_ctas, workspace.total_num_padded_tokens, workspace.cta_idx_xy_to_batch_idx,
workspace.cta_idx_xy_to_mn_limit, workspace.bmm2_workspace, device, stream, config.gemm2Config,
args.valid_hidden_size.value_or(args.hidden_size),
args.valid_intermediate_size.value_or(args.intermediate_size));
args.valid_intermediate_size.value_or(args.intermediate_size), args.max_num_ctas_in_batch_dim);

// Run finalize
if (args.do_finalize)
Expand Down
8 changes: 6 additions & 2 deletions cpp/tensorrt_llm/kernels/moe/trtllmGen/runner.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ class Runner
int32_t intermediateSize, int32_t numExperts, int32_t numTokens, int32_t* permutedIdxToTokenIdx,
int32_t* ptrNumNonExitingCtas, int32_t* ptrTotalNumPaddedTokens, int32_t* ptrCtaIdxXyToBatchIdx,
int32_t* ptrCtaIdxXyToMnLimit, void* bmm1Workspace, bool useRoutingScalesOnInput, int device,
cudaStream_t stream, int32_t configIndex, int32_t validHiddenSize = -1, int32_t validIntermediateSize = -1);
cudaStream_t stream, int32_t configIndex, int32_t validHiddenSize = -1, int32_t validIntermediateSize = -1,
int32_t maxNumCtasInBatchDim = 0);

private:
batchedGemm::trtllm::gen::Dtype mDtypeAct;
Expand Down Expand Up @@ -268,7 +269,7 @@ class Runner
int32_t intermediateSize, int32_t numExperts, int32_t numTokens, int32_t* ptrNumNonExitingCtas,
int32_t* ptrTotalNumPaddedTokens, int32_t* ptrCtaIdxXyToBatchIdx, int32_t* ptrCtaIdxXyToMnLimit,
void* bmm2Workspace, int device, cudaStream_t stream, int32_t configIndex, int32_t validHiddenSize = -1,
int32_t validIntermediateSize = -1);
int32_t validIntermediateSize = -1, int32_t maxNumCtasInBatchDim = 0);

private:
batchedGemm::trtllm::gen::Dtype mDtypeAct;
Expand Down Expand Up @@ -360,6 +361,9 @@ struct MoERunnerArgs
// Stop after FC1 (+ activation): the caller runs FC2 on workspace.gemm1_output / gemm1_output_scale with the
// routing tables. Requires do_finalize == false.
bool skip_gemm2{false};

// The most CTAs the caller's routing puts in the batch dimension, or 0 for the worst case of the problem.
int32_t max_num_ctas_in_batch_dim{0};
};

struct MoEWorkspace
Expand Down
Loading
Loading