[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dotgnu-pnet-commits] libjit ./ChangeLog jit/jit-gen-x86.h jit/jit-ru...
|
From: |
Aleksey Demakov |
|
Subject: |
[dotgnu-pnet-commits] libjit ./ChangeLog jit/jit-gen-x86.h jit/jit-ru... |
|
Date: |
Mon, 19 Dec 2005 20:36:40 +0000 |
CVSROOT: /sources/dotgnu-pnet
Module name: libjit
Branch:
Changes by: Aleksey Demakov <address@hidden> 05/12/19 20:36:40
Modified files:
. : ChangeLog
jit : jit-gen-x86.h jit-rules-x86.sel
Log message:
Floating point element load and store optimization. Register allocation
fixes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/libjit/ChangeLog.diff?tr1=1.180&tr2=1.181&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/libjit/jit/jit-gen-x86.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/libjit/jit/jit-rules-x86.sel.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
Patches:
Index: libjit/ChangeLog
diff -u libjit/ChangeLog:1.180 libjit/ChangeLog:1.181
--- libjit/ChangeLog:1.180 Sun Dec 18 17:44:54 2005
+++ libjit/ChangeLog Mon Dec 19 20:36:40 2005
@@ -1,3 +1,12 @@
+2005-12-20 Aleksey Demakov <address@hidden>
+
+ * jit/jit-gen-x86.h (x86_fld_memindex, x86_fld80_memindex)
+ (x86_fst_memindex, x86_fst80_memindex): add floating point load
+ and store macros with memindex addressing.
+
+ * jit/jit-rules-x86.sel: optimize floating point element load
+ and store rules. Fix potential register allocation problems.
+
2005-12-18 Aleksey Demakov <address@hidden>
* jit/jit-internal.h, jit/jit-function.c (jit_function_compile):
Index: libjit/jit/jit-gen-x86.h
diff -u libjit/jit/jit-gen-x86.h:1.3 libjit/jit/jit-gen-x86.h:1.4
--- libjit/jit/jit-gen-x86.h:1.3 Tue Dec 13 08:32:02 2005
+++ libjit/jit/jit-gen-x86.h Mon Dec 19 20:36:40 2005
@@ -1214,6 +1214,12 @@
x86_membase_emit ((inst), 0, (basereg), (disp)); \
} while (0)
+#define x86_fld_memindex(inst,basereg,disp,indexreg,shift,is_double) \
+ do { \
+ *(inst)++ = (is_double) ? (unsigned char)0xdd : (unsigned
char)0xd9; \
+ x86_memindex_emit ((inst), 0, (basereg), (disp), (indexreg),
(shift)); \
+ } while (0)
+
#define x86_fld80_mem(inst,mem) \
do { \
*(inst)++ = (unsigned char)0xdb; \
@@ -1226,6 +1232,12 @@
x86_membase_emit ((inst), 5, (basereg), (disp)); \
} while (0)
+#define x86_fld80_memindex(inst,basereg,disp,indexreg,shift) \
+ do { \
+ *(inst)++ = (unsigned char)0xdb; \
+ x86_memindex_emit ((inst), 5, (basereg), (disp), (indexreg),
(shift)); \
+ } while (0)
+
#define x86_fild(inst,mem,is_long) \
do { \
if ((is_long)) { \
@@ -1284,19 +1296,29 @@
x86_membase_emit ((inst), 2 + ((pop_stack) ? 1 : 0), (basereg),
(disp)); \
} while (0)
+#define x86_fst_memindex(inst,basereg,disp,indexreg,shift,is_double,pop_stack)
\
+ do { \
+ *(inst)++ = (is_double) ? (unsigned char)0xdd: (unsigned
char)0xd9; \
+ x86_memindex_emit ((inst), 2 + ((pop_stack) ? 1 : 0),
(basereg), (disp), (indexreg), (shift)); \
+ } while (0)
+
#define x86_fst80_mem(inst,mem) \
do { \
*(inst)++ = (unsigned char)0xdb; \
x86_mem_emit ((inst), 7, (mem)); \
} while (0)
-
#define x86_fst80_membase(inst,basereg,disp) \
do { \
*(inst)++ = (unsigned char)0xdb; \
x86_membase_emit ((inst), 7, (basereg), (disp)); \
} while (0)
+#define x86_fst80_memindex(inst,basereg,disp,indexreg,shift) \
+ do { \
+ *(inst)++ = (unsigned char)0xdb; \
+ x86_memindex_emit ((inst), 7, (basereg), (disp), (indexreg),
(shift)); \
+ } while (0)
#define x86_fist_pop(inst,mem,is_long) \
do { \
Index: libjit/jit/jit-rules-x86.sel
diff -u libjit/jit/jit-rules-x86.sel:1.33 libjit/jit/jit-rules-x86.sel:1.34
--- libjit/jit/jit-rules-x86.sel:1.33 Sat Dec 10 12:37:51 2005
+++ libjit/jit/jit-rules-x86.sel Mon Dec 19 20:36:40 2005
@@ -2853,8 +2853,7 @@
reg = _jit_reg_info[reg].cpu_reg;
reg2 = _jit_reg_info[reg2].cpu_reg;
- x86_lea_memindex(inst, reg, reg, 0, reg2, 2);
- x86_fld_membase(inst, reg, 0, 0);
+ x86_fld_memindex(inst, reg, 0, reg2, 2, 0);
gen->posn.ptr = inst;
}
@@ -2880,8 +2879,7 @@
reg = _jit_reg_info[reg].cpu_reg;
reg2 = _jit_reg_info[reg2].cpu_reg;
- x86_lea_memindex(inst, reg, reg, 0, reg2, 3);
- x86_fld_membase(inst, reg, 0, 1);
+ x86_fld_memindex(inst, reg, 0, reg2, 3, 1);
gen->posn.ptr = inst;
}
@@ -2891,9 +2889,11 @@
unsigned char *inst;
int reg, reg2, reg3;
- reg = _jit_regs_load_value(gen, insn->value1, 0,
- (insn->flags & (JIT_INSN_VALUE1_NEXT_USE |
JIT_INSN_VALUE1_LIVE)));
- reg2 = _jit_regs_load_value(gen, insn->value2, 0,
+ reg = _jit_regs_load_value
+ (gen, insn->value1, 0,
+ (insn->flags & (JIT_INSN_VALUE1_NEXT_USE |
JIT_INSN_VALUE1_LIVE)));
+ reg2 = _jit_regs_load_value
+ (gen, insn->value2, sizeof(jit_nfloat) !=
sizeof(jit_float64),
(insn->flags & (JIT_INSN_VALUE2_NEXT_USE |
JIT_INSN_VALUE2_LIVE)));
reg3 = _jit_regs_new_top(gen, insn->dest, 8);
@@ -2909,16 +2909,14 @@
if(sizeof(jit_nfloat) != sizeof(jit_float64))
{
- /* reg2 = reg2 + reg2 * 2 */
+ /* lea reg2, [reg2 + reg2 * 2] */
x86_lea_memindex(inst, reg2, reg2, 0, reg2, 1);
- /* reg = reg + reg2 * 4 */
- x86_lea_memindex(inst, reg, reg, 0, reg2, 2);
- x86_fld80_membase(inst, reg, 0);
+ /* fld [reg2 * 4] */
+ x86_fld80_memindex(inst, reg, 0, reg2, 2);
}
else
{
- x86_lea_memindex(inst, reg, reg, 0, reg2, 3);
- x86_fld_membase(inst, reg, 0, 1);
+ x86_fld_memindex(inst, reg, 0, reg2, 3, 1);
}
gen->posn.ptr = inst;
@@ -2945,16 +2943,17 @@
int reg, reg2, reg3, reg4;
int frame_offset;
+ _jit_regs_force_out(gen, insn->value2, 1);
+ _jit_gen_fix_value(insn->value2);
reg = _jit_regs_load_value
(gen, insn->dest, 0,
(insn->flags & (JIT_INSN_DEST_NEXT_USE |
JIT_INSN_DEST_LIVE)));
reg2 = _jit_regs_load_value
- (gen, insn->value1, 1,
+ (gen, insn->value1, 0,
(insn->flags & (JIT_INSN_VALUE1_NEXT_USE |
JIT_INSN_VALUE1_LIVE)));
_jit_regs_get_reg_pair(gen, reg, reg2, -1, ®3, ®4);
- _jit_gen_fix_value(insn->value2);
inst = gen->posn.ptr;
if(!jit_cache_check_for_n(&(gen->posn), 32))
@@ -2978,31 +2977,52 @@
JIT_OP_STORE_ELEMENT_FLOAT32: ternary
[reg, reg, freg] -> {
- x86_lea_memindex(inst, $1, $1, 0, $2, 2);
- x86_fst_membase(inst, $1, 0, 0, 1);
+ x86_fst_memindex(inst, $1, 0, $2, 2, 0, 1);
}
JIT_OP_STORE_ELEMENT_FLOAT64: ternary
[reg, reg, freg] -> {
- x86_lea_memindex(inst, $1, $1, 0, $2, 3);
- x86_fst_membase(inst, $1, 0, 1, 1);
+ x86_fst_memindex(inst, $1, 0, $2, 3, 1, 1);
}
-JIT_OP_STORE_ELEMENT_NFLOAT: ternary
- [reg, reg, freg] -> {
+JIT_OP_STORE_ELEMENT_NFLOAT: manual
+ [] -> {
+ unsigned char *inst;
+ int reg, reg2, reg3;
+
+ reg = _jit_regs_load_value
+ (gen, insn->dest, 0,
+ (insn->flags & (JIT_INSN_DEST_NEXT_USE |
JIT_INSN_DEST_LIVE)));
+ reg2 = _jit_regs_load_value
+ (gen, insn->value1, sizeof(jit_nfloat) !=
sizeof(jit_float64),
+ (insn->flags & (JIT_INSN_VALUE1_NEXT_USE |
JIT_INSN_VALUE1_LIVE)));
+ reg3 = _jit_regs_load_value
+ (gen, insn->value2, 0,
+ (insn->flags & (JIT_INSN_VALUE2_NEXT_USE |
JIT_INSN_VALUE2_LIVE)));
+
+ inst = (unsigned char *)(gen->posn.ptr);
+ if(!jit_cache_check_for_n(&(gen->posn), 32))
+ {
+ jit_cache_mark_full(&(gen->posn));
+ return;
+ }
+
+ reg = _jit_reg_info[reg].cpu_reg;
+ reg2 = _jit_reg_info[reg2].cpu_reg;
+
if(sizeof(jit_nfloat) != sizeof(jit_float64))
{
- /* reg2 = reg2 + reg2 * 2 */
- x86_lea_memindex(inst, $2, $2, 0, $2, 1);
- /* reg = reg + reg2 * 4 */
- x86_lea_memindex(inst, $1, $1, 0, $2, 2);
- x86_fst80_membase(inst, reg, 0);
+ /* lea reg2, [reg2 + reg2 * 2] */
+ x86_lea_memindex(inst, reg2, reg2, 0, reg2, 1);
+ /* fst [reg2 * 4] */
+ x86_fst80_memindex(inst, reg, 0, reg2, 2);
}
else
{
- x86_lea_memindex(inst, $1, $1, 0, $2, 3);
- x86_fst_membase(inst, $1, 0, 1, 1);
+ x86_fst_memindex(inst, reg, 0, reg2, 3, 1, 1);
}
+
+ gen->posn.ptr = (unsigned char *)inst;
}
/*
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [dotgnu-pnet-commits] libjit ./ChangeLog jit/jit-gen-x86.h jit/jit-ru...,
Aleksey Demakov <=