Skip to content

Commit 9bc460c

Browse files
committed
fix uint32_t
1 parent 4e469c2 commit 9bc460c

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

src/plugins/intel_cpu/src/nodes/kernels/x64/gather_uni_kernel.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ struct jitGatherKernelBase {
8787
}
8888
explicit jitGatherKernelBase(const jGatherConfParams& jcp, uint64_t vlen, uint64_t indicesTypeSize)
8989
: jcp(jcp),
90-
vlen(static_cast<uint32_t>(vlen)),
91-
dataElPerVec(static_cast<uint32_t>(vlen / jcp.dataTypeSize)),
92-
idxElPerVec(static_cast<uint32_t>(vlen / indicesTypeSize)),
90+
vlen(vlen),
91+
dataElPerVec(vlen / jcp.dataTypeSize),
92+
idxElPerVec(vlen / indicesTypeSize),
9393
is_real16_to_f32((jcp.in_prec == element::f16 || jcp.in_prec == element::bf16) &&
9494
jcp.out_prec == element::f32),
9595
is_f32_to_bf16(jcp.in_prec == element::f32 && jcp.out_prec == element::bf16) {}
@@ -109,9 +109,9 @@ struct jitGatherKernelBase {
109109

110110
protected:
111111
jGatherConfParams jcp;
112-
uint32_t vlen = 0;
113-
uint32_t dataElPerVec = 0;
114-
uint32_t idxElPerVec = 0;
112+
uint64_t vlen = 0;
113+
uint64_t dataElPerVec = 0;
114+
uint64_t idxElPerVec = 0;
115115
static const unsigned shufMask8bitUni[16];
116116
static const unsigned permMask8bitA2[8];
117117
static const unsigned permMask8bitA5[16];

src/plugins/intel_cpu/src/nodes/kernels/x64/grid_sample.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace ov::intel_cpu::kernel {
2828

2929
template <x64::cpu_isa_t isa>
3030
GridSampleKernel<isa>::GridSampleKernel(const GridSampleKernelConfParams& jcp)
31-
: GridSampleKernelBase(jit_name(), jcp, isa, static_cast<uint32_t>(x64::cpu_isa_traits_t<isa>::vlen)) {
31+
: GridSampleKernelBase(jit_name(), jcp, isa, static_cast<uint64_t>(x64::cpu_isa_traits_t<isa>::vlen)) {
3232
if (dataTypeSize == 2) {
3333
dataTypeShift = 1;
3434
} else if (dataTypeSize == 4) {

src/plugins/intel_cpu/src/nodes/kernels/x64/grid_sample.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@ class GridSampleKernelBase : public JitKernelBase {
9191
gridElPerVec(vlen / gridTypeSize) {}
9292

9393
virtual void create_ker() = 0;
94-
uint32_t getVecLen() const {
94+
uint64_t getVecLen() const {
9595
return vlen;
9696
}
97-
uint32_t getDataElPerVec() const {
97+
uint64_t getDataElPerVec() const {
9898
return dataElPerVec;
9999
}
100-
uint32_t getGridElPerVec() const {
100+
uint64_t getGridElPerVec() const {
101101
return gridElPerVec;
102102
}
103103

104104
protected:
105105
GridSampleKernelConfParams jcp;
106-
uint32_t vlen = 16LU;
107-
uint32_t dataTypeSize = 1LU;
108-
uint32_t gridTypeSize = 1LU;
109-
uint32_t dataElPerVec = 1LU;
110-
uint32_t gridElPerVec = 1LU;
106+
uint64_t vlen = 16LU;
107+
uint64_t dataTypeSize = 1LU;
108+
uint64_t gridTypeSize = 1LU;
109+
uint64_t dataElPerVec = 1LU;
110+
uint64_t gridElPerVec = 1LU;
111111
};
112112

113113
template <dnnl::impl::cpu::x64::cpu_isa_t isa>

src/plugins/intel_cpu/src/nodes/kernels/x64/jit_kernel_base.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,10 @@ void JitKernelBase::fillRestWorkMask(const Xbyak::Xmm& xmmDstMask,
419419
Xbyak::Label lEnd;
420420
auto r32Ones = getReg32();
421421
Xbyak::Reg64 r64Ones(r32Ones.getIdx());
422-
auto elPerVec = static_cast<uint32_t>(x64::cpu_isa_traits_t<x64::sse41>::vlen / typeSize);
422+
auto elPerVec = x64::cpu_isa_traits_t<x64::sse41>::vlen / typeSize;
423423

424424
mov(r64Ones, 0xFFFFFFFFFFFFFFFF);
425-
for (uint32_t i = 0; i < elPerVec; i++) {
425+
for (uint64_t i = 0; i < elPerVec; i++) {
426426
cmp(rWorkRest, i);
427427
jle(lEnd, T_NEAR);
428428

@@ -444,7 +444,7 @@ void JitKernelBase::fillRestWorkMask(const Xbyak::Ymm& ymmDstMask,
444444
const uint64_t typeSize) {
445445
OPENVINO_ASSERT(any_of(typeSize, 1U, 2U, 4U, 8U), "Could not fill data with type size ", typeSize);
446446
Xbyak::Label lEnd;
447-
auto elPerVec = static_cast<uint32_t>(x64::cpu_isa_traits_t<x64::sse41>::vlen / typeSize);
447+
auto elPerVec = x64::cpu_isa_traits_t<x64::sse41>::vlen / typeSize;
448448
auto r32Ones = getReg32();
449449
Xbyak::Reg64 r64Ones(r32Ones.getIdx());
450450
Xbyak::Xmm xmmDstMask(ymmDstMask.getIdx());
@@ -453,7 +453,7 @@ void JitKernelBase::fillRestWorkMask(const Xbyak::Ymm& ymmDstMask,
453453
uni_vpxor(ymmDstMask, ymmDstMask, ymmDstMask);
454454
for (uint8_t i = 0; i < 2; i++) {
455455
Xbyak::Label lPerm;
456-
for (uint32_t j = 0; j < elPerVec; j++) {
456+
for (uint64_t j = 0; j < elPerVec; j++) {
457457
cmp(rWorkRest, i * elPerVec + j);
458458
jle(i == 0 ? lEnd : lPerm, T_NEAR);
459459

src/plugins/intel_cpu/src/nodes/strided_slice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ void StridedSlice::initSupportedPrimitiveDescriptors() {
318318
}
319319
supportedTypes.push_back(LayoutType::ncsp);
320320
auto creators = BlockedDescCreator::getCommonCreators();
321-
auto range = BlockedDescCreator::makeFilteredRange(creators, static_cast<uint32_t>(nDims), supportedTypes);
321+
auto range = BlockedDescCreator::makeFilteredRange(creators, static_cast<unsigned int>(nDims), supportedTypes);
322322

323323
for (auto itr = range.first; itr != range.second; ++itr) {
324324
config.inConfs[attrs.DATA_ID].setMemDesc(

0 commit comments

Comments
 (0)