Skip to content

[SYCL][ABI-break] Remove fpga features from SYCL RT #20882

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.

Sign up for GitHub

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

Draft
againull wants to merge 1 commit into
base: sycl
Choose a base branch
from
Draft

[SYCL][ABI-break] Remove fpga features from SYCL RT #20882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions llvm/include/llvm/SYCLLowerIR/DeviceConfigFile.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ def AspectExt_intel_gpu_slices : Aspect<"ext_intel_gpu_slices">;
def AspectExt_intel_gpu_subslices_per_slice : Aspect<"ext_intel_gpu_subslices_per_slice">;
def AspectExt_intel_gpu_eu_count_per_subslice : Aspect<"ext_intel_gpu_eu_count_per_subslice">;
def AspectExt_intel_max_mem_bandwidth : Aspect<"ext_intel_max_mem_bandwidth">;
Copy link
Contributor

@bader bader Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this aspect also apply to FPGA only?

Copy link
Contributor

@bader bader Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose AspectExt_intel_memory_bus_width and AspectExt_intel_memory_clock_rate are unnecessary as well.

def AspectExt_intel_mem_channel : Aspect<"ext_intel_mem_channel">;
def AspectUsm_atomic_host_allocations : Aspect<"usm_atomic_host_allocations">;
def AspectUsm_atomic_shared_allocations : Aspect<"usm_atomic_shared_allocations">;
def AspectAtomic64 : Aspect<"atomic64">;
Expand Down Expand Up @@ -82,7 +81,6 @@ def AspectExt_oneapi_private_alloca : Aspect<"ext_oneapi_private_alloca">;
def AspectExt_oneapi_queue_profiling_tag : Aspect<"ext_oneapi_queue_profiling_tag">;
def AspectExt_oneapi_virtual_mem : Aspect<"ext_oneapi_virtual_mem">;
def AspectExt_oneapi_cuda_cluster_group : Aspect<"ext_oneapi_cuda_cluster_group">;
def AspectExt_intel_fpga_task_sequence : Aspect<"ext_intel_fpga_task_sequence">;
def AspectExt_oneapi_atomic16 : Aspect<"ext_oneapi_atomic16">;
def AspectExt_oneapi_virtual_functions : Aspect<"ext_oneapi_virtual_functions">;
def AspectExt_intel_spill_memory_size : Aspect<"ext_intel_spill_memory_size">;
Expand Down Expand Up @@ -139,7 +137,7 @@ def : TargetInfo<"__TestAspectList",
AspectUsm_shared_allocations, AspectUsm_system_allocations, AspectExt_intel_pci_address,
AspectExt_intel_gpu_eu_count, AspectExt_intel_gpu_eu_simd_width, AspectExt_intel_gpu_slices,
AspectExt_intel_gpu_subslices_per_slice, AspectExt_intel_gpu_eu_count_per_subslice,
AspectExt_intel_max_mem_bandwidth, AspectExt_intel_mem_channel, AspectUsm_atomic_host_allocations,
AspectExt_intel_max_mem_bandwidth, AspectUsm_atomic_host_allocations,
AspectUsm_atomic_shared_allocations, AspectAtomic64, AspectExt_intel_device_info_uuid, AspectExt_oneapi_srgb,
AspectExt_oneapi_native_assert, AspectHost_debuggable, AspectExt_intel_gpu_hw_threads_per_eu,
AspectExt_oneapi_cuda_async_barrier, AspectExt_intel_free_memory,
Expand All @@ -163,7 +161,6 @@ def : TargetInfo<"__TestAspectList",
AspectExt_oneapi_tangle, AspectExt_intel_matrix, AspectExt_oneapi_is_composite, AspectExt_oneapi_is_component,
AspectExt_oneapi_graph, AspectExt_oneapi_limited_graph, AspectExt_oneapi_private_alloca,
AspectExt_oneapi_queue_profiling_tag, AspectExt_oneapi_virtual_mem, AspectExt_oneapi_cuda_cluster_group,
AspectExt_intel_fpga_task_sequence,
AspectExt_oneapi_atomic16,
AspectExt_oneapi_virtual_functions,
AspectExt_intel_spill_memory_size,
Expand Down
59 changes: 0 additions & 59 deletions llvm/include/llvm/SYCLLowerIR/HostPipes.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion llvm/lib/SYCLLowerIR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ add_llvm_component_library(LLVMSYCLLowerIR
DeviceGlobals.cpp
ESIMD/LowerESIMDVLoadVStore.cpp
ESIMD/LowerESIMDSlmReservation.cpp
HostPipes.cpp
LowerInvokeSimd.cpp
LowerWGLocalMemory.cpp
LowerWGScope.cpp
Expand Down
7 changes: 0 additions & 7 deletions llvm/lib/SYCLLowerIR/CompileTimePropertiesPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
#include "llvm/SYCLLowerIR/DeviceGlobals.h"
#include "llvm/SYCLLowerIR/ESIMD/ESIMDUtils.h"
#include "llvm/SYCLLowerIR/HostPipes.h"
#include "llvm/SYCLLowerIR/TargetHelpers.h"

#include "llvm/ADT/APInt.h"
Expand Down Expand Up @@ -602,12 +601,6 @@ PreservedAnalyses CompileTimePropertiesPass::run(Module &M,
HostAccessDecorValue, VarName));
}

if (isHostPipeVariable(GV)) {
auto VarName = getGlobalVariableUniqueId(GV);
MDOps.push_back(buildSpirvDecorMetadata(
Ctx, SpirvHostAccessDecor, SpirvHostAccessDefaultValue, VarName));
}

// Add the generated metadata to the variable
if (!MDOps.empty()) {
GV.addMetadata(MDKindID, *MDNode::get(Ctx, MDOps));
Expand Down
8 changes: 4 additions & 4 deletions llvm/lib/SYCLLowerIR/DeviceGlobals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ bool hasDeviceImageScopeProperty(const GlobalVariable &GV) {
return hasProperty(GV, SYCL_DEVICE_IMAGE_SCOPE_ATTR);
}

/// Returns the unique id for the device global or host pipe variable.
/// Returns the unique id for the device global variable.
///
/// The function gets this value from the LLVM IR attribute \c
/// sycl-unique-id.
///
/// @param GV [in] Device Global or Hostpipe variable.
/// @param GV [in] Device Global variable.
///
/// @returns the unique id of the device global or hostpipe variable
/// @returns the unique id of the device global variable
/// represented in the LLVM IR by \c GV.
StringRef getGlobalVariableUniqueId(const GlobalVariable &GV) {
assert(GV.hasAttribute(SYCL_UNIQUE_ID_ATTR) &&
"a 'sycl-unique-id' string must be associated with every device "
"global or hostpipe variable");
"global variable");
return GV.getAttribute(SYCL_UNIQUE_ID_ATTR).getValueAsString();
}

Expand Down
80 changes: 0 additions & 80 deletions llvm/lib/SYCLLowerIR/HostPipes.cpp
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions llvm/lib/SYCLPostLink/ComputeModuleRuntimeInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "llvm/IR/PassInstrumentation.h"
#include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
#include "llvm/SYCLLowerIR/DeviceGlobals.h"
#include "llvm/SYCLLowerIR/HostPipes.h"
#include "llvm/SYCLLowerIR/LowerWGLocalMemory.h"
#include "llvm/SYCLLowerIR/SYCLKernelParamOptInfo.h"
#include "llvm/SYCLLowerIR/SYCLUtils.h"
Expand Down Expand Up @@ -388,10 +387,6 @@ PropSetRegTy computeModuleProperties(const Module &M,
PropSet.add(PropSetRegTy::SYCL_DEVICE_GLOBALS, DevGlobalPropertyMap);
}

auto HostPipePropertyMap = collectHostPipeProperties(M);
if (!HostPipePropertyMap.empty()) {
PropSet.add(PropSetRegTy::SYCL_HOST_PIPES, HostPipePropertyMap);
}
bool IsSpecConstantDefault =
M.getNamedMetadata(
SpecConstantsPass::SPEC_CONST_DEFAULT_VAL_MODULE_MD_STRING) !=
Expand Down
15 changes: 0 additions & 15 deletions llvm/test/SYCLLowerIR/CompileTimePropertiesPass/fpga-single-task-property.ll
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions llvm/test/SYCLLowerIR/CompileTimePropertiesPass/host-pipes/basic.ll
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions llvm/test/SYCLLowerIR/CompileTimePropertiesPass/kernel-attributes/fpga-cluster.ll
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion llvm/tools/sycl-post-link/sycl-post-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
#include "llvm/SYCLLowerIR/DeviceConfigFile.hpp"
#include "llvm/SYCLLowerIR/ESIMD/ESIMDUtils.h"
#include "llvm/SYCLLowerIR/HostPipes.h"
#include "llvm/SYCLLowerIR/LowerInvokeSimd.h"
#include "llvm/SYCLLowerIR/SYCLDeviceLibBF16.h"
#include "llvm/SYCLLowerIR/SYCLJointMatrixTransform.h"
Expand Down
Loading
Loading