Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add size for CudaCubinInMemory #9045

Closed
wants to merge 1 commit into from
Closed
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
3 changes: 2 additions & 1 deletion xla/service/gpu/stream_executor_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ absl::StatusOr<std::unique_ptr<se::Kernel>> CreateKernel(

if (!cubin_data.empty()) {
loader_spec.AddCudaCubinInMemory(
reinterpret_cast<const char*>(cubin_data.data()), kernel_name);
reinterpret_cast<const char*>(cubin_data.data()), cubin_data.size(),
kernel_name);
}

TF_ASSIGN_OR_RETURN(std::unique_ptr<se::Kernel> kernel,
Expand Down
3 changes: 2 additions & 1 deletion xla/stream_executor/kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,8 @@ inline absl::StatusOr<TypedKernel<Args...>> TypedKernel<Args...>::Create(

if (!cubin_data.empty()) {
loader_spec.AddCudaCubinInMemory(
reinterpret_cast<const char *>(cubin_data.data()), kernel_name);
reinterpret_cast<const char *>(cubin_data.data()), cubin_data.size(),
kernel_name);
}

return TypedKernel<Args...>::Create(executor, loader_spec);
Expand Down
8 changes: 4 additions & 4 deletions xla/stream_executor/kernel_spec.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ KernelLoaderSpec::KernelLoaderSpec(absl::string_view kernel_name)
InProcessSymbol::InProcessSymbol(void *symbol, std::string kernel_name)
: KernelLoaderSpec(std::move(kernel_name)), symbol_(symbol) {}

CudaCubinInMemory::CudaCubinInMemory(const char *bytes,
CudaCubinInMemory::CudaCubinInMemory(const char *bytes, int size,
absl::string_view kernel_name)
: KernelLoaderSpec(kernel_name), bytes_(bytes) {}
: KernelLoaderSpec(kernel_name), bytes_(bytes), size_(size) {}

const std::tuple<int, int> CudaPtxInMemory::kMinimumCapability{1, 0};

Expand Down Expand Up @@ -87,9 +87,9 @@ MultiKernelLoaderSpec *MultiKernelLoaderSpec::AddInProcessSymbol(
}

MultiKernelLoaderSpec *MultiKernelLoaderSpec::AddCudaCubinInMemory(
const char *bytes, absl::string_view kernel_name) {
const char *bytes, int size, absl::string_view kernel_name) {
CHECK(cuda_cubin_in_memory_ == nullptr);
cuda_cubin_in_memory_.reset(new CudaCubinInMemory{bytes, kernel_name});
cuda_cubin_in_memory_.reset(new CudaCubinInMemory{bytes, size, kernel_name});
return this;
}

Expand Down
6 changes: 4 additions & 2 deletions xla/stream_executor/kernel_spec.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,14 @@ class CudaPtxInMemory : public KernelLoaderSpec {
// Kernel loader specification for a CUBIN blob that resides in memory.
class CudaCubinInMemory : public KernelLoaderSpec {
public:
CudaCubinInMemory(const char *bytes, absl::string_view kernel_name);
CudaCubinInMemory(const char *bytes, int size, absl::string_view kernel_name);

const char *bytes() const { return bytes_; }
const int size() const { return size_; }

private:
const char *bytes_;
int size_;

CudaCubinInMemory(const CudaCubinInMemory &) = delete;
void operator=(const CudaCubinInMemory &) = delete;
Expand Down Expand Up @@ -220,7 +222,7 @@ class MultiKernelLoaderSpec {
// mangled by the compiler if it is not declared in an extern "C" scope.
MultiKernelLoaderSpec *AddInProcessSymbol(void *symbol,
absl::string_view kernel_name);
MultiKernelLoaderSpec *AddCudaCubinInMemory(const char *cubin_bytes,
MultiKernelLoaderSpec *AddCudaCubinInMemory(const char *cubin_bytes, int size,
absl::string_view kernel_name);
MultiKernelLoaderSpec *AddCudaPtxInMemory(absl::string_view ptx,
absl::string_view kernel_name);
Expand Down
Loading