mips: Implement optimized clor, clzr, ctor and ctzr - lightning.git - Portable just-in-time compiler library

index : lightning.git
Portable just-in-time compiler library
summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorpcpa <paulo.cesar.pereira.de.andrade@gmail.com>2023年02月14日 18:10:37 -0300
committerpcpa <paulo.cesar.pereira.de.andrade@gmail.com>2023年02月14日 18:10:37 -0300
commitf2f5da0898b174f0b8b07922a2daf99f46bad727 (patch)
treeb1150c389d19e3917a273568dde226df32ae4b80 /lib
parentb4ab65c82a09a75e59fc66841903bdf36e913849 (diff)
downloadlightning-f2f5da0898b174f0b8b07922a2daf99f46bad727.tar.gz
mips: Implement optimized clor, clzr, ctor and ctzr
This change also adds a better logic to discover mips release version. It is still not complete, but good for the moment. Instructions were added to mips release 6, but these are untested. Also corrected a bug when checking if a forward unconditional jump is reachable, where it did not check when validating range for mips release 2, while the code generating the optimized jump did check for it. Problem noticed when misdetecting mips release version.
Diffstat (limited to 'lib')
-rw-r--r--lib/jit_mips-cpu.c 154
-rw-r--r--lib/jit_mips-sz.c 52
-rw-r--r--lib/jit_mips.c 31
3 files changed, 201 insertions, 36 deletions
diff --git a/lib/jit_mips-cpu.c b/lib/jit_mips-cpu.c
index fee94b5..6a27b26 100644
--- a/lib/jit_mips-cpu.c
+++ b/lib/jit_mips-cpu.c
@@ -55,11 +55,8 @@ typedef union {
jit_uint32_t op_u32;
int op;
} jit_instr_t;
-#if _MIPS_ARCH_MIPS3 || defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_MIPS64R2)
-# define jit_mips2_p() 1
-#else
-# define jit_mips2_p() 0
-#endif
+#define jit_mips2_p() (jit_cpu.release >= 2)
+#define jit_mips6_p() (jit_cpu.release >= 6)
# define _ZERO_REGNO 0
# define _T0_REGNO 0x08
# define _T1_REGNO 0x09
@@ -397,17 +394,37 @@ static void _nop(jit_state_t*,jit_int32_t);
# define BNE(rs,rt,im) hrri(MIPS_BNE,rs,rt,im)
# define BGEZAL(rs,im) hrri(MIPS_REGIMM,rs,MIPS_BGEZAL,im)
# define JALR(r0) hrrrit(MIPS_SPECIAL,r0,0,_RA_REGNO,0,MIPS_JALR)
-# if 1 /* supports MIPS32 R6 */
-# define JR(r0) hrrrit(MIPS_SPECIAL,r0,0,0,0,MIPS_JALR)
-# else /* does not support MIPS32 R6 */
-# define JR(r0) hrrrit(MIPS_SPECIAL,r0,0,0,0,MIPS_JR)
+# if 1 /* This should work for mips r6 or older */
+# define JR(r0) hrrrit(MIPS_SPECIAL,r0,0,0,0,MIPS_JALR)
+# else /* This should generate an illegal instruction in mips r6 */
+# define JR(r0) hrrrit(MIPS_SPECIAL,r0,0,0,0,MIPS_JR)
# endif
+# define CLO_R6(rd,rs) hrrrit(MIPS_SPECIAL,rs,0,rd,1,0x11)
+# define DCLO_R6(rd,rs) hrrrit(MIPS_SPECIAL,rs,0,rd,1,0x13)
+# define CLZ_R6(rd,rs) hrrrit(MIPS_SPECIAL,rs,0,rd,1,0x10)
+# define DCLZ_R6(rd,rs) hrrrit(MIPS_SPECIAL,rs,0,rd,1,0x12)
+# define BITSWAP(rd,rt) hrrrit(MIPS_SPECIAL3,0,rt,rd,0,0x20)
+# define DBITSWAP(rd,rt) hrrrit(MIPS_SPECIAL3,0,rt,rd,0,0x24)
+# define CLO(rd,rs) hrrrit(MIPS_SPECIAL2,rs,rd,rd,0,MIPS_CLO)
+# define DCLO(rd,rs) hrrrit(MIPS_SPECIAL2,rs,rd,rd,0,MIPS_DCLO)
+# define CLZ(rd,rs) hrrrit(MIPS_SPECIAL2,rs,rd,rd,0,MIPS_CLZ)
+# define DCLZ(rd,rs) hrrrit(MIPS_SPECIAL2,rs,rd,rd,0,MIPS_DCLZ)
# define J(i0) hi(MIPS_J,i0)
# define JAL(i0) hi(MIPS_JAL,i0)
# define MOVN(rd,rs,rt) hrrrit(0,rs,rt,rd,0,MIPS_MOVN)
# define MOVZ(rd,rs,rt) hrrrit(0,rs,rt,rd,0,MIPS_MOVZ)
# define comr(r0,r1) xori(r0,r1,-1)
# define negr(r0,r1) subr(r0,_ZERO_REGNO,r1)
+# define bitswap(r0,r1) _bitswap(_jit, r0, r1);
+static void _bitswap(jit_state_t*,jit_int32_t,jit_int32_t);
+# define clor(r0, r1) _clor(_jit, r0, r1)
+static void _clor(jit_state_t*, jit_int32_t, jit_int32_t);
+# define clzr(r0, r1) _clzr(_jit, r0, r1)
+static void _clzr(jit_state_t*, jit_int32_t, jit_int32_t);
+# define ctor(r0, r1) _ctor(_jit, r0, r1)
+static void _ctor(jit_state_t*, jit_int32_t, jit_int32_t);
+# define ctzr(r0, r1) _ctzr(_jit, r0, r1)
+static void _ctzr(jit_state_t*, jit_int32_t, jit_int32_t);
# if __WORDSIZE == 32
# define addr(rd,rs,rt) ADDU(rd,rs,rt)
# define addiu(r0,r1,i0) ADDIU(r0,r1,i0)
@@ -1028,6 +1045,125 @@ _insr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1,
DINS(r0, r1, pos, size);
}
+/* http://graphics.stanford.edu/~seander/bithacks.html#ReverseParallel */
+/*
+unsigned int s = sizeof(v) * CHAR_BIT; // bit size; must be power of 2
+unsigned int mask = ~0;
+while ((s >>= 1) > 0)
+{
+ mask ^= (mask << s);
+ v = ((v >> s) & mask) | ((v << s) & ~mask);
+}
+*/
+static void
+_bitswap(jit_state_t *_jit, jit_int32_t v, jit_int32_t r1)
+{
+ jit_int32_t s, mask;
+ jit_word_t loop, done, t0, t1;
+ movr(v, r1);
+ s = jit_get_reg(jit_class_gpr);
+ movi(rn(s), __WORDSIZE); /* s = sizeof(v) * CHAR_BIT; */
+ mask = jit_get_reg(jit_class_gpr);
+ movi(rn(mask), ~0L); /* mask = ~0; */
+ loop = _jit->pc.w; /* while ((s >>= 1) > 0) */
+ rshi(rn(s), rn(s), 1); /* (s >>= 1) */
+ done = blei(_jit->pc.w, rn(s), 0, NULL); /* no loop if s <= 0 */
+ t0 = jit_get_reg(jit_class_gpr);
+ lshr(rn(t0), rn(mask), rn(s)); /* t0 = (mask << s) */
+ xorr(rn(mask), rn(mask), rn(t0)); /* mask ^= t0 */
+ rshr(rn(t0), v, rn(s)); /* t0 = v >> s */
+ andr(rn(t0), rn(t0), rn(mask)); /* t0 = t0 & mask */
+ t1 = jit_get_reg(jit_class_gpr);
+ lshr(rn(t1), v, rn(s)); /* t1 = v << s */
+ comr(v, rn(mask)); /* v = ~mask */
+ andr(rn(t1), v, rn(t1)); /* t1 = t1 & v */
+ orr(v, rn(t0), rn(t1)); /* v = t0 | t1 */
+ jmpi(loop, NULL, 0);
+ patch_at(done, _jit->pc.w);
+ jit_unget_reg(t1);
+ jit_unget_reg(t0);
+ jit_unget_reg(mask);
+ jit_unget_reg(s);
+}
+
+static void
+_clor(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
+{
+#if __WORDSIZE == 32
+ /* must sign extend top 32 bits */
+ SLL(r0, r1, 0);
+ if (jit_mips6_p())
+ CLO_R6(r0, r0);
+ else
+ CLO(r0, r0);
+#else
+ if (jit_mips6_p())
+ DCLO_R6(r0, r1);
+ else
+ DCLO(r0, r1);
+#endif
+}
+
+static void
+_clzr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
+{
+#if __WORDSIZE == 32
+ /* must sign extend top 32 bits */
+ SLL(r0, r1, 0);
+ if (jit_mips6_p())
+ CLZ_R6(r0, r0);
+ else
+ CLZ(r0, r0);
+#else
+ if (jit_mips6_p())
+ DCLZ_R6(r0, r1);
+ else
+ DCLZ(r0, r1);
+#endif
+}
+
+static void
+_ctor(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
+{
+ if (jit_mips6_p()) {
+#if __WORDSIZE == 32
+ BITSWAP(r0, r1);
+ /* must sign extend top 32 bits */
+ SLL(r0, r0, 0);
+ CLO_R6(r0, r0);
+#else
+ DBITSWAP(r0, r1);
+ DCLO_R6(r0, r0);
+#endif
+ }
+ else {
+ //fallback_cto(r0, r1);
+ bitswap(r0, r1);
+ clor(r0, r0);
+ }
+}
+
+static void
+_ctzr(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
+{
+ if (jit_mips6_p()) {
+#if __WORDSIZE == 32
+ BITSWAP(r0, r1);
+ /* must sign extend top 32 bits */
+ SLL(r0, r0, 0);
+ CLZ_R6(r0, r0);
+#else
+ DBITSWAP(r0, r1);
+ DCLZ_R6(r0, r0);
+#endif
+ }
+ else {
+ //fallback_ctz(r0, r1);
+ bitswap(r0, r1);
+ clzr(r0, r0);
+ }
+}
+
static void
_addi(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0)
{
diff --git a/lib/jit_mips-sz.c b/lib/jit_mips-sz.c
index f49406d..0a7436d 100644
--- a/lib/jit_mips-sz.c
+++ b/lib/jit_mips-sz.c
@@ -57,8 +57,8 @@
28, /* subxr */
28, /* subxi */
16, /* rsbi */
- 8, /* mulr */
- 16, /* muli */
+ 4, /* mulr */
+ 12, /* muli */
12, /* qmulr */
20, /* qmuli */
12, /* qmulr_u */
@@ -76,7 +76,7 @@
8, /* remr_u */
16, /* remi_u */
4, /* andr */
- 12, /* andi */
+ 8, /* andi */
4, /* orr */
12, /* ori */
4, /* xorr */
@@ -97,8 +97,8 @@
4, /* lei */
8, /* ler_u */
4, /* lei_u */
- 12, /* eqr */
- 12, /* eqi */
+ 8, /* eqr */
+ 8, /* eqi */
8, /* ger */
8, /* gei */
8, /* ger_u */
@@ -115,14 +115,14 @@
4, /* movzr */
36, /* casr */
44, /* casi */
- 8, /* extr_c */
+ 4, /* extr_c */
4, /* extr_uc */
- 8, /* extr_s */
+ 4, /* extr_s */
4, /* extr_us */
0, /* extr_i */
0, /* extr_ui */
- 20, /* bswapr_us */
- 52, /* bswapr_ui */
+ 8, /* bswapr_us */
+ 8, /* bswapr_ui */
0, /* bswapr_ul */
4, /* htonr_us */
4, /* htonr_ui */
@@ -446,13 +446,17 @@
8, /* movi_d_ww */
0, /* movr_d_w */
0, /* movi_d_w */
+ 8, /* clo */
+ 8, /* clz */
+ 76, /* cto */
+ 76, /* ctz */
#endif /* __WORDSIZE */
#if __WORDSIZE == 64
-#define JIT_INSTR_MAX 116
+#define JIT_INSTR_MAX 76
0, /* data */
0, /* live */
- 16, /* align */
+ 24, /* align */
0, /* save */
0, /* load */
4, /* skip */
@@ -525,7 +529,7 @@
8, /* remr_u */
32, /* remi_u */
4, /* andr */
- 16, /* andi */
+ 8, /* andi */
4, /* orr */
28, /* ori */
4, /* xorr */
@@ -546,8 +550,8 @@
4, /* lei */
8, /* ler_u */
4, /* lei_u */
- 12, /* eqr */
- 12, /* eqi */
+ 8, /* eqr */
+ 8, /* eqi */
8, /* ger */
8, /* gei */
8, /* ger_u */
@@ -564,17 +568,17 @@
4, /* movzr */
36, /* casr */
56, /* casi */
- 8, /* extr_c */
+ 4, /* extr_c */
4, /* extr_uc */
- 8, /* extr_s */
+ 4, /* extr_s */
4, /* extr_us */
4, /* extr_i */
- 8, /* extr_ui */
- 20, /* bswapr_us */
- 52, /* bswapr_ui */
- 116, /* bswapr_ul */
+ 4, /* extr_ui */
+ 8, /* bswapr_us */
+ 16, /* bswapr_ui */
+ 44, /* bswapr_ul */
4, /* htonr_us */
- 8, /* htonr_ui */
+ 4, /* htonr_ui */
4, /* htonr_ul */
4, /* ldr_c */
24, /* ldi_c */
@@ -639,7 +643,7 @@
12, /* bgtr_u */
16, /* bgti_u */
8, /* bner */
- 32, /* bnei */
+ 28, /* bnei */
12, /* bmsr */
12, /* bmsi */
12, /* bmcr */
@@ -895,4 +899,8 @@
0, /* movi_d_ww */
4, /* movr_d_w */
24, /* movi_d_w */
+ 4, /* clo */
+ 4, /* clz */
+ 72, /* cto */
+ 72, /* ctz */
#endif /* __WORDSIZE */
diff --git a/lib/jit_mips.c b/lib/jit_mips.c
index 9a0dc35..41a9dda 100644
--- a/lib/jit_mips.c
+++ b/lib/jit_mips.c
@@ -85,6 +85,7 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
/*
* Initialization
*/
+jit_cpu_t jit_cpu;
jit_register_t _rvs[] = {
{ rc(gpr) | 0x01, "at" },
{ rc(gpr) | 0x02, "v0" },
@@ -175,6 +176,30 @@ static jit_int32_t fregs[] = {
void
jit_get_cpu(void)
{
+#if defined(__linux__)
+ FILE *fp;
+ char *ptr;
+ char buf[128];
+
+ if ((fp = fopen("/proc/cpuinfo", "r")) != NULL) {
+ while (fgets(buf, sizeof(buf), fp)) {
+ if (strncmp(buf, "isa : ", 8) == 0) {
+ if ((ptr = strstr(buf + 9, "mips64r")))
+ jit_cpu.release = strtoul(ptr + 7, NULL, 10);
+ break;
+ }
+ }
+ fclose(fp);
+ }
+#endif
+ /* This is very fragile -- with clang, __mips is defined as 64 */
+#if defined _MIPS_ARCH /* OpenBSD/clang */
+ if (!jit_cpu.release)
+ jit_cpu.release = strtoul(&_MIPS_ARCH[4], NULL, 10);
+#elif defined(__mips) /* Linux/gcc */
+ if (!jit_cpu.release)
+ jit_cpu.release = __mips;
+#endif
}
void
@@ -1575,10 +1600,6 @@ _emit_code(jit_state_t *_jit)
break;
case_rr(neg,);
case_rr(com,);
-#define clor(r0, r1) fallback_clo(r0, r1)
-#define clzr(r0, r1) fallback_clz(r0, r1)
-#define ctor(r0, r1) fallback_cto(r0, r1)
-#define ctzr(r0, r1) fallback_ctz(r0, r1)
case_rr(clo,);
case_rr(clz,);
case_rr(cto,);
@@ -1849,7 +1870,7 @@ _emit_code(jit_state_t *_jit)
else {
word = _jit->code.length -
(_jit->pc.uc - _jit->code.ptr);
- if (can_relative_jump_p(word))
+ if (jit_mips2_p() && can_relative_jump_p(word))
word = calli(_jit->pc.w, prev, 1);
else
word = calli_p(_jit->pc.w);
generated by cgit v1.2.3 (git 2.39.1) at 2025年09月20日 13:45:24 +0000

AltStyle によって変換されたページ (->オリジナル) /