In a nutshell, this moves our libomptarget code to populate the offload subproject. With this commit, users need to enable the new LLVM/Offload subproject as a runtime in their cmake configuration. No further changes are expected for downstream code. Tests and other components still depend on OpenMP and have also not been renamed. The results below are for a build in which OpenMP and Offload are enabled runtimes. In addition to the pure `git mv`, we needed to adjust some CMake files. Nothing is intended to change semantics. ``` ninja check-offload ``` Works with the X86 and AMDGPU offload tests ``` ninja check-openmp ``` Still works but doesn't build offload tests anymore. ``` ls install/lib ``` Shows all expected libraries, incl. - `libomptarget.devicertl.a` - `libomptarget-nvptx-sm_90.bc` - `libomptarget.rtl.amdgpu.so` -> `libomptarget.rtl.amdgpu.so.18git` - `libomptarget.so` -> `libomptarget.so.18git` Fixes: https://github.com/llvm/llvm-project/issues/75124 --------- Co-authored-by: Saiyedul Islam <Saiyedul.Islam@amd.com>
45 lines
1.1 KiB
C++
45 lines
1.1 KiB
C++
//===-------- Allocator.h - OpenMP memory allocator interface ---- C++ -*-===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef OMPTARGET_ALLOCATOR_H
|
|
#define OMPTARGET_ALLOCATOR_H
|
|
|
|
#include "Types.h"
|
|
|
|
// Forward declaration.
|
|
struct KernelEnvironmentTy;
|
|
|
|
#pragma omp begin declare target device_type(nohost)
|
|
|
|
namespace ompx {
|
|
|
|
namespace allocator {
|
|
|
|
static uint64_t constexpr ALIGNMENT = 16;
|
|
|
|
/// Initialize the allocator according to \p KernelEnvironment
|
|
void init(bool IsSPMD, KernelEnvironmentTy &KernelEnvironment);
|
|
|
|
/// Allocate \p Size bytes.
|
|
[[gnu::alloc_size(1), gnu::assume_aligned(ALIGNMENT), gnu::malloc]] void *
|
|
alloc(uint64_t Size);
|
|
|
|
/// Free the allocation pointed to by \p Ptr.
|
|
void free(void *Ptr);
|
|
|
|
} // namespace allocator
|
|
|
|
} // namespace ompx
|
|
|
|
#pragma omp end declare target
|
|
|
|
#endif
|