Skip to content

[SYCL] Remove FuncParamKindINTEL and FuncParamDescINTEL #15882

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

Merged
merged 1 commit into from
Oct 28, 2024
Merged

[SYCL] Remove FuncParamKindINTEL and FuncParamDescINTEL #15882

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
13 changes: 0 additions & 13 deletions llvm-spirv/lib/SPIRV/SPIRVReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4664,22 +4664,9 @@ bool SPIRVToLLVM::transVectorComputeMetadata(SPIRVFunction *BF) {
std::to_string(Kind));
F->addParamAttr(ArgNo, Attr);
}
if (BA->hasDecorate(internal::DecorationFuncParamKindINTEL, 0, &Kind)) {
Attribute Attr = Attribute::get(*Context, kVCMetadata::VCArgumentKind,
std::to_string(Kind));
F->addParamAttr(ArgNo, Attr);
}
SEVAttr = translateSEVMetadata(BA, F->getContext());
if (SEVAttr)
F->addParamAttr(ArgNo, SEVAttr.value());
if (BA->hasDecorate(internal::DecorationFuncParamDescINTEL)) {
auto Desc =
BA->getDecorationStringLiteral(internal::DecorationFuncParamDescINTEL)
.front();
Attribute Attr =
Attribute::get(*Context, kVCMetadata::VCArgumentDesc, Desc);
F->addParamAttr(ArgNo, Attr);
}
if (BA->hasDecorate(DecorationMediaBlockIOINTEL)) {
assert(BA->getType()->isTypeImage() &&
"MediaBlockIOINTEL decoration is valid only on image parameters");
Expand Down
13 changes: 0 additions & 13 deletions llvm-spirv/lib/SPIRV/SPIRVWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,19 +1070,6 @@ void LLVMToSPIRVBase::transVectorComputeMetadata(Function *F) {
if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCSingleElementVector))
translateSEVDecoration(
Attrs.getParamAttr(ArgNo, kVCMetadata::VCSingleElementVector), BA);
if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCArgumentKind)) {
SPIRVWord Kind;
Attrs.getParamAttr(ArgNo, kVCMetadata::VCArgumentKind)
.getValueAsString()
.getAsInteger(0, Kind);
BA->addDecorate(internal::DecorationFuncParamKindINTEL, Kind);
}
if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCArgumentDesc)) {
StringRef Desc =
Attrs.getParamAttr(ArgNo, kVCMetadata::VCArgumentDesc)
.getValueAsString();
BA->addDecorate(new SPIRVDecorateFuncParamDescAttr(BA, Desc.str()));
}
if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCMediaBlockIO)) {
assert(BA->getType()->isTypeImage() &&
"VCMediaBlockIO attribute valid only on image parameters");
Expand Down
2 changes: 0 additions & 2 deletions llvm-spirv/lib/SPIRV/VectorComputeUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ const static char VCGlobalVariable[] = "VCGlobalVariable";
const static char VCVolatile[] = "VCVolatile";
const static char VCByteOffset[] = "VCByteOffset";
const static char VCSIMTCall[] = "VCSIMTCall";
const static char VCArgumentKind[] = "VCArgumentKind";
const static char VCArgumentDesc[] = "VCArgumentDesc";
const static char VCCallable[] = "VCCallable";
const static char VCSingleElementVector[] = "VCSingleElementVector";
const static char VCFCEntry[] = "VCFCEntry";
Expand Down
12 changes: 0 additions & 12 deletions llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@ void SPIRVDecorate::encode(spv_ostream &O) const {
case DecorationUserSemantic:
SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
break;
case internal::DecorationFuncParamDescINTEL:
SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
break;
case internal::DecorationHostAccessINTEL:
SPIRVDecorateHostAccessINTELLegacy::encodeLiterals(Encoder, Literals);
break;
Expand Down Expand Up @@ -162,9 +159,6 @@ void SPIRVDecorate::decode(std::istream &I) {
case DecorationUserSemantic:
SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
break;
case internal::DecorationFuncParamDescINTEL:
SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
break;
case internal::DecorationHostAccessINTEL:
SPIRVDecorateHostAccessINTELLegacy::decodeLiterals(Decoder, Literals);
break;
Expand Down Expand Up @@ -206,9 +200,6 @@ void SPIRVMemberDecorate::encode(spv_ostream &O) const {
case DecorationUserSemantic:
SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
break;
case internal::DecorationFuncParamDescINTEL:
SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
break;
default:
Encoder << Literals;
}
Expand All @@ -232,9 +223,6 @@ void SPIRVMemberDecorate::decode(std::istream &I) {
case DecorationUserSemantic:
SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
break;
case internal::DecorationFuncParamDescINTEL:
SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
break;
default:
Decoder >> Literals;
}
Expand Down
9 changes: 0 additions & 9 deletions llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,15 +521,6 @@ class SPIRVDecorateUserSemanticAttr
: SPIRVDecorateStrAttrBase(TheTarget, AnnotateString) {}
};

class SPIRVDecorateFuncParamDescAttr
: public SPIRVDecorateStrAttrBase<internal::DecorationFuncParamDescINTEL> {
public:
// Complete constructor for UserSemantic decoration
SPIRVDecorateFuncParamDescAttr(SPIRVEntry *TheTarget,
const std::string &AnnotateString)
: SPIRVDecorateStrAttrBase(TheTarget, AnnotateString) {}
};

class SPIRVDecorateMergeINTELAttr : public SPIRVDecorate {
public:
// Complete constructor for MergeINTEL decoration
Expand Down
4 changes: 0 additions & 4 deletions llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,6 @@ template <> inline void SPIRVMap<Decoration, SPIRVCapVec>::init() {
ADD_VEC_INIT(DecorationFuncParamIOKindINTEL, {CapabilityVectorComputeINTEL});
ADD_VEC_INIT(DecorationStackCallINTEL, {CapabilityVectorComputeINTEL});
ADD_VEC_INIT(DecorationSIMTCallINTEL, {CapabilityVectorComputeINTEL});
ADD_VEC_INIT(internal::DecorationFuncParamKindINTEL,
{CapabilityVectorComputeINTEL});
ADD_VEC_INIT(internal::DecorationFuncParamDescINTEL,
{CapabilityVectorComputeINTEL});
ADD_VEC_INIT(DecorationBurstCoalesceINTEL,
{CapabilityFPGAMemoryAccessesINTEL});
ADD_VEC_INIT(DecorationCacheSizeINTEL, {CapabilityFPGAMemoryAccessesINTEL});
Expand Down
2 changes: 0 additions & 2 deletions llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
add(DecorationCacheControlStoreINTEL, "CacheControlStoreINTEL");

// From spirv_internal.hpp
add(internal::DecorationFuncParamKindINTEL, "FuncParamKindINTEL");
add(internal::DecorationFuncParamDescINTEL, "FuncParamDescINTEL");
add(internal::DecorationCallableFunctionINTEL, "CallableFunctionINTEL");
add(internal::DecorationRuntimeAlignedINTEL, "RuntimeAlignedINTEL");
add(internal::DecorationHostAccessINTEL, "HostAccessINTEL");
Expand Down
6 changes: 0 additions & 6 deletions llvm-spirv/lib/SPIRV/libSPIRV/spirv_internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ enum InternalDecoration {
IDecInitModeINTEL = 6148,
IDecImplementInCSRINTEL = 6149,
IDecArgumentAttributeINTEL = 6409,
IDecFuncParamKindINTEL = 9624,
IDecFuncParamDescINTEL = 9625
};

enum InternalCapability {
Expand Down Expand Up @@ -283,10 +281,6 @@ constexpr Decoration DecorationImplementInCSRINTEL =
static_cast<Decoration>(IDecImplementInCSRINTEL);
constexpr Decoration DecorationArgumentAttributeINTEL =
static_cast<Decoration>(IDecArgumentAttributeINTEL);
constexpr Decoration DecorationFuncParamKindINTEL =
static_cast<Decoration>(IDecFuncParamKindINTEL);
constexpr Decoration DecorationFuncParamDescINTEL =
static_cast<Decoration>(IDecFuncParamDescINTEL);

constexpr Capability CapabilityFastCompositeINTEL =
static_cast<Capability>(ICapFastCompositeINTEL);
Expand Down
32 changes: 0 additions & 32 deletions llvm-spirv/test/transcoding/decoration_func_param_desc.ll
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions llvm-spirv/test/transcoding/decoration_func_param_kind.ll
View file
Open in desktop

This file was deleted.

Loading