This is an archive of the discontinued LLVM Phabricator instance.

Differential D150362

[libc][obvious] Fix undefined variable after name change
ClosedPublic

Authored by jhuber6 on May 11 2023, 6:39 AM.

Details

Reviewers
None
Commits
rG30093d6be249: [libc][obvious] Fix undefined variable after name change
Summary

I forgot that we still used these variables in the loaders.

Diff Detail

Event Timeline

jhuber6 created this revision.May 11 2023, 6:39 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMay 11 2023, 6:39 AM
Herald added subscribers: libc-commits, mattd, asavonic and 4 others. · View Herald Transcript
jhuber6 requested review of this revision.May 11 2023, 6:39 AM
This revision was not accepted when it landed; it landed in state Needs Review.May 11 2023, 7:00 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG30093d6be249: [libc][obvious] Fix undefined variable after name change (authored by jhuber6). · Explain Why
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rG30093d6be249: [libc][obvious] Fix undefined variable after name change.

Revision Contents

PathSize
libc/
utils/
gpu/
loader/
amdgpu/
2 lines
nvptx/
2 lines

Diff 521292

libc/utils/gpu/loader/amdgpu/Loader.cpp

Show First 20 Lines • Show All 324 Lines • ▼ Show 20 Linesint load(int argc, char **argv, char **envp, void *image, size_t size,
void *dev_ret; void *dev_ret;
if (hsa_status_t err = if (hsa_status_t err =
hsa_amd_memory_pool_allocate(coarsegrained_pool, sizeof(int), hsa_amd_memory_pool_allocate(coarsegrained_pool, sizeof(int),
/*flags=*/0, &dev_ret)) /*flags=*/0, &dev_ret))
handle_error(err); handle_error(err);
hsa_amd_memory_fill(dev_ret, 0, sizeof(int)); hsa_amd_memory_fill(dev_ret, 0, sizeof(int));
// Allocate finegrained memory for the RPC server and client to share. // Allocate finegrained memory for the RPC server and client to share.
uint64_t port_size = __llvm_libc::rpc::default_port_count; uint64_t port_size = __llvm_libc::rpc::DEFAULT_PORT_COUNT;
uint32_t wavefront_size = 0; uint32_t wavefront_size = 0;
if (hsa_status_t err = hsa_agent_get_info( if (hsa_status_t err = hsa_agent_get_info(
dev_agent, HSA_AGENT_INFO_WAVEFRONT_SIZE, &wavefront_size)) dev_agent, HSA_AGENT_INFO_WAVEFRONT_SIZE, &wavefront_size))
handle_error(err); handle_error(err);
uint64_t rpc_shared_buffer_size = uint64_t rpc_shared_buffer_size =
__llvm_libc::rpc::Server::allocation_size(port_size, wavefront_size); __llvm_libc::rpc::Server::allocation_size(port_size, wavefront_size);
void *rpc_shared_buffer; void *rpc_shared_buffer;
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines

libc/utils/gpu/loader/nvptx/Loader.cpp

Show First 20 Lines • Show All 240 Lines • ▼ Show 20 Linesint load(int argc, char **argv, char **envp, void *image, size_t size,
// Allocate space for the return pointer and initialize it to zero. // Allocate space for the return pointer and initialize it to zero.
CUdeviceptr dev_ret; CUdeviceptr dev_ret;
if (CUresult err = cuMemAlloc(&dev_ret, sizeof(int))) if (CUresult err = cuMemAlloc(&dev_ret, sizeof(int)))
handle_error(err); handle_error(err);
if (CUresult err = cuMemsetD32(dev_ret, 0, 1)) if (CUresult err = cuMemsetD32(dev_ret, 0, 1))
handle_error(err); handle_error(err);
uint64_t port_size = __llvm_libc::rpc::default_port_count; uint64_t port_size = __llvm_libc::rpc::DEFAULT_PORT_COUNT;
uint32_t warp_size = 32; uint32_t warp_size = 32;
uint64_t rpc_shared_buffer_size = uint64_t rpc_shared_buffer_size =
__llvm_libc::rpc::Server::allocation_size(port_size, warp_size); __llvm_libc::rpc::Server::allocation_size(port_size, warp_size);
void *rpc_shared_buffer = allocator(rpc_shared_buffer_size); void *rpc_shared_buffer = allocator(rpc_shared_buffer_size);
if (!rpc_shared_buffer) if (!rpc_shared_buffer)
handle_error("Failed to allocate memory the RPC client / server."); handle_error("Failed to allocate memory the RPC client / server.");
▲ Show 20 Lines • Show All 46 Lines • Show Last 20 Lines