Skip to content

Commit 943f39d

Browse files
committed
Revert "[Libomptarget] Add RPC-based printf implementation for OpenMP (#85638)"
This reverts commit 2cf8118. Failing tests, revert until I can fix it
1 parent 01e2274 commit 943f39d

File tree

3 files changed

+0
-54
lines changed

3 files changed

+0
-54
lines changed

openmp/libomptarget/DeviceRTL/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,6 @@ set(clang_opt_flags -O3 -mllvm -openmp-opt-disable -DSHARED_SCRATCHPAD_SIZE=512
122122
set(link_opt_flags -O3 -openmp-opt-disable -attributor-enable=module -vectorize-slp=false )
123123
set(link_export_flag -passes=internalize -internalize-public-api-file=${source_directory}/exports)
124124

125-
# If the user built with the GPU C library enabled we will use that instead.
126-
if(${LIBOMPTARGET_GPU_LIBC_SUPPORT})
127-
list(APPEND clang_opt_flags -DOMPTARGET_HAS_LIBC)
128-
endif()
129-
130125
# Prepend -I to each list element
131126
set (LIBOMPTARGET_LLVM_INCLUDE_DIRS_DEVICERTL "${LIBOMPTARGET_LLVM_INCLUDE_DIRS}")
132127
list(TRANSFORM LIBOMPTARGET_LLVM_INCLUDE_DIRS_DEVICERTL PREPEND "-I")

openmp/libomptarget/DeviceRTL/src/LibC.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,10 @@ void memset(void *dst, int C, size_t count) {
5353
dstc[I] = C;
5454
}
5555

56-
// If the user built with the GPU C library enabled we will assume that we can
57-
// call it.
58-
#ifdef OMPTARGET_HAS_LIBC
59-
60-
// TODO: Remove this handling once we have varargs support.
61-
extern struct FILE *stdout;
62-
int32_t rpc_fprintf(FILE *, const char *, void *, uint64_t);
63-
64-
int32_t __llvm_omp_vprintf(const char *Format, void *Arguments, uint32_t Size) {
65-
return rpc_fprintf(stdout, Format, Arguments, Size);
66-
}
67-
#else
6856
/// printf() calls are rewritten by CGGPUBuiltin to __llvm_omp_vprintf
6957
int32_t __llvm_omp_vprintf(const char *Format, void *Arguments, uint32_t Size) {
7058
return impl::omp_vprintf(Format, Arguments, Size);
7159
}
72-
#endif
7360
}
7461

7562
#pragma omp end declare target

openmp/libomptarget/test/libc/printf.c

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)