Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linux 5.0 compat: ASM_BUG macro #8725

Merged
merged 1 commit into from
May 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions module/zfs/vdev_raidz_math_aarch64_neon_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
#define _R_23(_0, _1, REG2, REG3, ...) REG2, REG3
#define R_23(REG...) _R_23(REG, 1, 2, 3)

#define ASM_BUG() ASSERT(0)
#define ZFS_ASM_BUG() ASSERT(0)

#define OFFSET(ptr, val) (((unsigned char *)(ptr))+val)

Expand Down Expand Up @@ -197,7 +197,7 @@ typedef struct v {
: "v20", "v21"); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -221,7 +221,7 @@ typedef struct v {
: RVR0(r), RVR1(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -256,7 +256,7 @@ typedef struct v {
: WVR0(r), WVR1(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -280,7 +280,7 @@ typedef struct v {
: RVR0(r), RVR1(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -329,7 +329,7 @@ typedef struct v {
[SRC1] "Q" (*(OFFSET(src, 16)))); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -378,7 +378,7 @@ typedef struct v {
: RVR0(r), RVR1(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -441,7 +441,7 @@ typedef struct v {
: "v18", "v19"); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -512,7 +512,7 @@ typedef struct v {
: "v10", "v11", "v12", "v13", "v14", "v15"); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -527,7 +527,7 @@ typedef struct v {
_MULx2(c, R_01(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down
20 changes: 10 additions & 10 deletions module/zfs/vdev_raidz_math_avx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#define _R_23(_0, _1, REG2, REG3, ...) REG2, REG3
#define R_23(REG...) _R_23(REG, 1, 2, 3)

#define ASM_BUG() ASSERT(0)
#define ZFS_ASM_BUG() ASSERT(0)

extern const uint8_t gf_clmul_mod_lt[4*256][16];

Expand Down Expand Up @@ -84,7 +84,7 @@ typedef struct v {
: : [SRC] "r" (src)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -104,7 +104,7 @@ typedef struct v {
"vpxor %" VR1(r) ", %" VR3(r)", %" VR3(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -126,7 +126,7 @@ typedef struct v {
"vmovdqa %" VR1(r) ", %" VR3(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -148,7 +148,7 @@ typedef struct v {
: : [SRC] "r" (src)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -170,7 +170,7 @@ typedef struct v {
: : [DST] "r" (dst)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -201,7 +201,7 @@ typedef struct v {
"vpxor %ymm13, %" VR1(r)", %" VR1(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -216,7 +216,7 @@ typedef struct v {
_MUL2(r); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -277,7 +277,7 @@ static const uint8_t __attribute__((aligned(32))) _mul_mask = 0x0F;
[lt] "r" (gf_clmul_mod_lt[4*(c)])); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -292,7 +292,7 @@ static const uint8_t __attribute__((aligned(32))) _mul_mask = 0x0F;
_MULx2(c, R_01(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down
20 changes: 10 additions & 10 deletions module/zfs/vdev_raidz_math_avx512bw.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#define _R_23(_0, _1, REG2, REG3, ...) REG2, REG3
#define R_23(REG...) _R_23(REG, 1, 2, 3)

#define ASM_BUG() ASSERT(0)
#define ZFS_ASM_BUG() ASSERT(0)

extern const uint8_t gf_clmul_mod_lt[4*256][16];

Expand Down Expand Up @@ -85,7 +85,7 @@ typedef struct v {
: : [SRC] "r" (src)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -105,7 +105,7 @@ typedef struct v {
"vpxorq %" VR1(r) ", %" VR3(r)", %" VR3(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -127,7 +127,7 @@ typedef struct v {
"vmovdqa64 %" VR1(r) ", %" VR3(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -149,7 +149,7 @@ typedef struct v {
: : [SRC] "r" (src)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -171,7 +171,7 @@ typedef struct v {
: : [DST] "r" (dst)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -197,7 +197,7 @@ typedef struct v {
"vmovdqu8 %zmm13, %" VR1(r) "{%k2}"); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -212,7 +212,7 @@ typedef struct v {
_MUL2(r); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -273,7 +273,7 @@ static const uint8_t __attribute__((aligned(64))) _mul_mask = 0x0F;
[lt] "r" (gf_clmul_mod_lt[4*(c)])); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -288,7 +288,7 @@ static const uint8_t __attribute__((aligned(64))) _mul_mask = 0x0F;
_MULx2(c, R_01(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down
20 changes: 10 additions & 10 deletions module/zfs/vdev_raidz_math_ssse3.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#define _R_23(_0, _1, REG2, REG3, ...) REG2, REG3
#define R_23(REG...) _R_23(REG, 1, 2, 3)

#define ASM_BUG() ASSERT(0)
#define ZFS_ASM_BUG() ASSERT(0)

const uint8_t gf_clmul_mod_lt[4*256][16];

Expand Down Expand Up @@ -85,7 +85,7 @@ typedef struct v {
: : [SRC] "r" (src)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -105,7 +105,7 @@ typedef struct v {
"pxor %" VR1(r) ", %" VR3(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -127,7 +127,7 @@ typedef struct v {
"movdqa %" VR1(r) ", %" VR3(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -149,7 +149,7 @@ typedef struct v {
: : [SRC] "r" (src)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -171,7 +171,7 @@ typedef struct v {
: : [DST] "r" (dst)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -200,7 +200,7 @@ typedef struct v {
"pxor %xmm13, %" VR1(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -215,7 +215,7 @@ typedef struct v {
_MUL2_x2(r); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down Expand Up @@ -284,7 +284,7 @@ typedef struct v {
[lt] "r" (gf_clmul_mod_lt[4*(c)])); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand All @@ -299,7 +299,7 @@ typedef struct v {
_MULx2(c, R_01(r)); \
break; \
default: \
ASM_BUG(); \
ZFS_ASM_BUG(); \
} \
}

Expand Down