Skip to content

[NFC] Remove ExecutionModeNamedBarrierCountINTEL from spirv_internal #1604

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 2 commits into from
Aug 23, 2022
Merged

[NFC] Remove ExecutionModeNamedBarrierCountINTEL from spirv_internal #1604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcc1eeb
[NFC] Remove ExecutionModeNamedBarrierCountINTEL from spirv_internal
MrSidims Aug 23, 2022
5094b57
Fix clang-format
MrSidims Aug 23, 2022
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
2 changes: 1 addition & 1 deletion lib/SPIRV/PreprocessMetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ void PreprocessMetadataBase::preprocessVectorComputeMetadata(Module *M,
.getAsInteger(0, NBarrierCnt);
EM.addOp()
.add(&F)
.add(spv::internal::ExecutionModeNamedBarrierCountINTEL)
.add(spv::ExecutionModeNamedBarrierCountINTEL)
.add(NBarrierCnt)
.done();
}
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4216,7 +4216,7 @@ bool SPIRVToLLVM::transVectorComputeMetadata(SPIRVFunction *BF) {
}

if (auto *EM =
BF->getExecutionMode(internal::ExecutionModeNamedBarrierCountINTEL)) {
BF->getExecutionMode(ExecutionModeNamedBarrierCountINTEL)) {
unsigned int NBarrierCnt = EM->getLiterals()[0];
Attribute Attr = Attribute::get(*Context, kVCMetadata::VCNamedBarrierCount,
std::to_string(NBarrierCnt));
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4560,7 +4560,7 @@ bool LLVMToSPIRVBase::transExecutionMode() {
break;
AddSingleArgExecutionMode(static_cast<ExecutionMode>(EMode));
} break;
case spv::internal::ExecutionModeNamedBarrierCountINTEL: {
case spv::ExecutionModeNamedBarrierCountINTEL: {
if (!BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_vector_compute))
break;
unsigned NBarrierCnt = 0;
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/libSPIRV/SPIRVEntry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ void SPIRVExecutionMode::decode(std::istream &I) {
case ExecutionModeFloatingPointModeALTINTEL:
case ExecutionModeFloatingPointModeIEEEINTEL:
case ExecutionModeSharedLocalMemorySizeINTEL:
case internal::ExecutionModeNamedBarrierCountINTEL:
case ExecutionModeNamedBarrierCountINTEL:
case ExecutionModeSubgroupSize:
case ExecutionModeMaxWorkDimINTEL:
case ExecutionModeNumSIMDWorkitemsINTEL:
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/libSPIRV/SPIRVEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ template <> inline void SPIRVMap<SPIRVExecutionModeKind, SPIRVCapVec>::init() {
{internal::CapabilityFastCompositeINTEL});
ADD_VEC_INIT(internal::ExecutionModeStreamingInterfaceINTEL,
{CapabilityFPGAKernelAttributesINTEL});
ADD_VEC_INIT(internal::ExecutionModeNamedBarrierCountINTEL,
ADD_VEC_INIT(ExecutionModeNamedBarrierCountINTEL,
{CapabilityVectorComputeINTEL});
}

Expand Down
6 changes: 1 addition & 5 deletions lib/SPIRV/libSPIRV/spirv_internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ enum InternalFunctionControlMask { IFunctionControlOptNoneINTELMask = 0x10000 };

enum InternalExecutionMode {
IExecModeFastCompositeKernelINTEL = 6088,
IExecModeStreamingInterfaceINTEL = 6154,
IExecModeNamedBarrierCountINTEL = 6417
IExecModeStreamingInterfaceINTEL = 6154
};

enum InternalLoopControlMask { ILoopControlLoopCountINTELMask = 0x1000000 };
Expand Down Expand Up @@ -179,9 +178,6 @@ constexpr ExecutionMode ExecutionModeFastCompositeKernelINTEL =
constexpr ExecutionMode ExecutionModeStreamingInterfaceINTEL =
static_cast<ExecutionMode>(IExecModeStreamingInterfaceINTEL);

constexpr ExecutionMode ExecutionModeNamedBarrierCountINTEL =
static_cast<ExecutionMode>(IExecModeNamedBarrierCountINTEL);

static const LoopControlMask LoopControlLoopCountINTELMask =
static_cast<LoopControlMask>(ILoopControlLoopCountINTELMask);

Expand Down