Skip to content

Commit 502506a

Browse files
committed
[SYCL][ABI-break] Remove fpga features from SYCL RT
1 parent f746a55 commit 502506a

File tree

207 files changed

+349
-10546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+349
-10546
lines changed

llvm/include/llvm/SYCLLowerIR/DeviceConfigFile.td

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def AspectExt_intel_gpu_slices : Aspect<"ext_intel_gpu_slices">;
3333
def AspectExt_intel_gpu_subslices_per_slice : Aspect<"ext_intel_gpu_subslices_per_slice">;
3434
def AspectExt_intel_gpu_eu_count_per_subslice : Aspect<"ext_intel_gpu_eu_count_per_subslice">;
3535
def AspectExt_intel_max_mem_bandwidth : Aspect<"ext_intel_max_mem_bandwidth">;
36-
def AspectExt_intel_mem_channel : Aspect<"ext_intel_mem_channel">;
3736
def AspectUsm_atomic_host_allocations : Aspect<"usm_atomic_host_allocations">;
3837
def AspectUsm_atomic_shared_allocations : Aspect<"usm_atomic_shared_allocations">;
3938
def AspectAtomic64 : Aspect<"atomic64">;
@@ -82,7 +81,6 @@ def AspectExt_oneapi_private_alloca : Aspect<"ext_oneapi_private_alloca">;
8281
def AspectExt_oneapi_queue_profiling_tag : Aspect<"ext_oneapi_queue_profiling_tag">;
8382
def AspectExt_oneapi_virtual_mem : Aspect<"ext_oneapi_virtual_mem">;
8483
def AspectExt_oneapi_cuda_cluster_group : Aspect<"ext_oneapi_cuda_cluster_group">;
85-
def AspectExt_intel_fpga_task_sequence : Aspect<"ext_intel_fpga_task_sequence">;
8684
def AspectExt_oneapi_atomic16 : Aspect<"ext_oneapi_atomic16">;
8785
def AspectExt_oneapi_virtual_functions : Aspect<"ext_oneapi_virtual_functions">;
8886
def AspectExt_intel_spill_memory_size : Aspect<"ext_intel_spill_memory_size">;
@@ -139,7 +137,7 @@ def : TargetInfo<"__TestAspectList",
139137
AspectUsm_shared_allocations, AspectUsm_system_allocations, AspectExt_intel_pci_address,
140138
AspectExt_intel_gpu_eu_count, AspectExt_intel_gpu_eu_simd_width, AspectExt_intel_gpu_slices,
141139
AspectExt_intel_gpu_subslices_per_slice, AspectExt_intel_gpu_eu_count_per_subslice,
142-
AspectExt_intel_max_mem_bandwidth, AspectExt_intel_mem_channel, AspectUsm_atomic_host_allocations,
140+
AspectExt_intel_max_mem_bandwidth, AspectUsm_atomic_host_allocations,
143141
AspectUsm_atomic_shared_allocations, AspectAtomic64, AspectExt_intel_device_info_uuid, AspectExt_oneapi_srgb,
144142
AspectExt_oneapi_native_assert, AspectHost_debuggable, AspectExt_intel_gpu_hw_threads_per_eu,
145143
AspectExt_oneapi_cuda_async_barrier, AspectExt_intel_free_memory,
@@ -163,7 +161,6 @@ def : TargetInfo<"__TestAspectList",
163161
AspectExt_oneapi_tangle, AspectExt_intel_matrix, AspectExt_oneapi_is_composite, AspectExt_oneapi_is_component,
164162
AspectExt_oneapi_graph, AspectExt_oneapi_limited_graph, AspectExt_oneapi_private_alloca,
165163
AspectExt_oneapi_queue_profiling_tag, AspectExt_oneapi_virtual_mem, AspectExt_oneapi_cuda_cluster_group,
166-
AspectExt_intel_fpga_task_sequence,
167164
AspectExt_oneapi_atomic16,
168165
AspectExt_oneapi_virtual_functions,
169166
AspectExt_intel_spill_memory_size,

llvm/include/llvm/SYCLLowerIR/HostPipes.h

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

llvm/lib/SYCLLowerIR/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ add_llvm_component_library(LLVMSYCLLowerIR
3939
DeviceGlobals.cpp
4040
ESIMD/LowerESIMDVLoadVStore.cpp
4141
ESIMD/LowerESIMDSlmReservation.cpp
42-
HostPipes.cpp
4342
LowerInvokeSimd.cpp
4443
LowerWGLocalMemory.cpp
4544
LowerWGScope.cpp

llvm/lib/SYCLLowerIR/CompileTimePropertiesPass.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
1212
#include "llvm/SYCLLowerIR/DeviceGlobals.h"
1313
#include "llvm/SYCLLowerIR/ESIMD/ESIMDUtils.h"
14-
#include "llvm/SYCLLowerIR/HostPipes.h"
1514
#include "llvm/SYCLLowerIR/TargetHelpers.h"
1615

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

605-
if (isHostPipeVariable(GV)) {
606-
auto VarName = getGlobalVariableUniqueId(GV);
607-
MDOps.push_back(buildSpirvDecorMetadata(
608-
Ctx, SpirvHostAccessDecor, SpirvHostAccessDefaultValue, VarName));
609-
}
610-
611604
// Add the generated metadata to the variable
612605
if (!MDOps.empty()) {
613606
GV.addMetadata(MDKindID, *MDNode::get(Ctx, MDOps));

llvm/lib/SYCLLowerIR/DeviceGlobals.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ bool hasDeviceImageScopeProperty(const GlobalVariable &GV) {
7272
return hasProperty(GV, SYCL_DEVICE_IMAGE_SCOPE_ATTR);
7373
}
7474

75-
/// Returns the unique id for the device global or host pipe variable.
75+
/// Returns the unique id for the device global variable.
7676
///
7777
/// The function gets this value from the LLVM IR attribute \c
7878
/// sycl-unique-id.
7979
///
80-
/// @param GV [in] Device Global or Hostpipe variable.
80+
/// @param GV [in] Device Global variable.
8181
///
82-
/// @returns the unique id of the device global or hostpipe variable
82+
/// @returns the unique id of the device global variable
8383
/// represented in the LLVM IR by \c GV.
8484
StringRef getGlobalVariableUniqueId(const GlobalVariable &GV) {
8585
assert(GV.hasAttribute(SYCL_UNIQUE_ID_ATTR) &&
8686
"a 'sycl-unique-id' string must be associated with every device "
87-
"global or hostpipe variable");
87+
"global variable");
8888
return GV.getAttribute(SYCL_UNIQUE_ID_ATTR).getValueAsString();
8989
}
9090

llvm/lib/SYCLLowerIR/HostPipes.cpp

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

llvm/lib/SYCLPostLink/ComputeModuleRuntimeInfo.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "llvm/IR/PassInstrumentation.h"
1515
#include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
1616
#include "llvm/SYCLLowerIR/DeviceGlobals.h"
17-
#include "llvm/SYCLLowerIR/HostPipes.h"
1817
#include "llvm/SYCLLowerIR/LowerWGLocalMemory.h"
1918
#include "llvm/SYCLLowerIR/SYCLKernelParamOptInfo.h"
2019
#include "llvm/SYCLLowerIR/SYCLUtils.h"
@@ -388,10 +387,6 @@ PropSetRegTy computeModuleProperties(const Module &M,
388387
PropSet.add(PropSetRegTy::SYCL_DEVICE_GLOBALS, DevGlobalPropertyMap);
389388
}
390389

391-
auto HostPipePropertyMap = collectHostPipeProperties(M);
392-
if (!HostPipePropertyMap.empty()) {
393-
PropSet.add(PropSetRegTy::SYCL_HOST_PIPES, HostPipePropertyMap);
394-
}
395390
bool IsSpecConstantDefault =
396391
M.getNamedMetadata(
397392
SpecConstantsPass::SPEC_CONST_DEFAULT_VAL_MODULE_MD_STRING) !=

llvm/test/SYCLLowerIR/CompileTimePropertiesPass/fpga-single-task-property.ll

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

llvm/test/SYCLLowerIR/CompileTimePropertiesPass/host-pipes/basic.ll

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

llvm/test/SYCLLowerIR/CompileTimePropertiesPass/kernel-attributes/fpga-cluster.ll

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

0 commit comments

Comments
 (0)