OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add option -mfence-as-lock-add=[no|yes]. 

With -mfence-as-lock-add=yes lfence, mfence and sfence will be encoded
as lock addl $0x0, (%{r,e}sp).

gas/:

    * config/tc-i386.c (avoid_fence): New.
    (output_insn): Encode as lock addl $0x0, (%{r,e}sp) if avoid_fence
    is true.
    (OPTION_FENCE_AS_LOCK_ADD): New.
    (md_longopts): Add -mfence-as-lock-add.
    (md_parse_option): Handle -mfence-as-lock-add.
    (md_show_usage): Add -mfence-as-lock-add=[no|yes].
    * doc/c-i386.texi (-mfence-as-lock-add): Document.

gas/testsuite/:

    * gas/i386/i386.exp: Run new tests.
    * gas/i386/fence-as-lock-add.s: New.
    * gas/i386/fence-as-lock-add-yes.d: Likewise.
    * gas/i386/fence-as-lock-add-no.d: Likewise.
    * gas/i386/x86-64-fence-as-lock-add-yes.d: Likewise.
    * gas/i386/x86-64-fence-as-lock-add-no.d: Likewise.
This commit is contained in:
Andrew Senkevich 2016-01-29 15:46:50 +03:00
parent d64450d73a
commit e4e00185b5
9 changed files with 131 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gas/ChangeLog
View File

@ -1,3 +1,21 @@
2016-01-29 Andrew Senkevich <andrew.senkevich@intel.com>
H.J. Lu <hongjiu.lu@intel.com>
* config/tc-i386.c (avoid_fence): New.
(output_insn): Encode as lock addl $0x0, (%{r,e}sp) if avoid_fence
is true.
(OPTION_FENCE_AS_LOCK_ADD): New.
(md_longopts): Add -mfence-as-lock-add.
(md_parse_option): Handle -mfence-as-lock-add.
(md_show_usage): Add -mfence-as-lock-add=[no|yes].
* doc/c-i386.texi (-mfence-as-lock-add): Document.
* gas/i386/i386.exp: Run new tests.
* gas/i386/fence-as-lock-add.s: New.
* gas/i386/fence-as-lock-add-yes.d: Likewise.
* gas/i386/fence-as-lock-add-no.d: Likewise.
* gas/i386/x86-64-fence-as-lock-add-yes.d: Likewise.
* gas/i386/x86-64-fence-as-lock-add-no.d: Likewise.
2016-01-27 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (compressed_debug_sections): Remove trailing `]'.

35
gas/config/tc-i386.c
View File

@ -552,6 +552,10 @@ static int allow_index_reg = 0;
specified explicitly. */
static int omit_lock_prefix = 0;
/* 1 if the assembler should encode lfence, mfence, and sfence as
"lock addl $0, (%{re}sp)". */
static int avoid_fence = 0;
static enum check_kind
{
check_none = 0,
@ -6956,6 +6960,22 @@ output_insn (void)
unsigned int j;
unsigned int prefix;
if (avoid_fence
&& i.tm.base_opcode == 0xfae
&& i.operands == 1
&& i.imm_operands == 1
&& (i.op[0].imms->X_add_number == 0xe8
|| i.op[0].imms->X_add_number == 0xf0
|| i.op[0].imms->X_add_number == 0xf8))
{
/* Encode lfence, mfence, and sfence as
f0 83 04 24 00 lock addl $0x0, (%{re}sp). */
offsetT val = 0x240483f0ULL;
p = frag_more (5);
md_number_to_chars (p, val, 5);
return;
}
/* Some processors fail on LOCK prefix. This options makes
assembler ignore LOCK prefix and serves as a workaround. */
if (omit_lock_prefix)
@ -9622,6 +9642,7 @@ const char *md_shortopts = "qn";
#define OPTION_MSHARED (OPTION_MD_BASE + 21)
#define OPTION_MAMD64 (OPTION_MD_BASE + 22)
#define OPTION_MINTEL64 (OPTION_MD_BASE + 23)
#define OPTION_MFENCE_AS_LOCK_ADD (OPTION_MD_BASE + 24)
struct option md_longopts[] =
{
@ -9653,6 +9674,7 @@ struct option md_longopts[] =
{"mbig-obj", no_argument, NULL, OPTION_MBIG_OBJ},
#endif
{"momit-lock-prefix", required_argument, NULL, OPTION_MOMIT_LOCK_PREFIX},
{"mfence-as-lock-add", required_argument, NULL, OPTION_MFENCE_AS_LOCK_ADD},
{"mevexrcig", required_argument, NULL, OPTION_MEVEXRCIG},
{"mamd64", no_argument, NULL, OPTION_MAMD64},
{"mintel64", no_argument, NULL, OPTION_MINTEL64},
@ -9972,6 +9994,15 @@ md_parse_option (int c, char *arg)
as_fatal (_("invalid -momit-lock-prefix= option: `%s'"), arg);
break;
case OPTION_MFENCE_AS_LOCK_ADD:
if (strcasecmp (arg, "yes") == 0)
avoid_fence = 1;
else if (strcasecmp (arg, "no") == 0)
avoid_fence = 0;
else
as_fatal (_("invalid -mfence-as-lock-add= option: `%s'"), arg);
break;
case OPTION_MAMD64:
cpu_arch_flags.bitfield.cpuamd64 = 1;
cpu_arch_flags.bitfield.cpuintel64 = 0;
@ -10152,6 +10183,10 @@ md_show_usage (FILE *stream)
-momit-lock-prefix=[no|yes]\n\
strip all lock prefixes\n"));
fprintf (stream, _("\
-mfence-as-lock-add=[no|yes]\n\
encode lfence, mfence and sfence as\n\
lock addl $0x0, (%%{re}sp)\n"));
fprintf (stream, _("\
-mamd64 accept only AMD64 ISA\n"));
fprintf (stream, _("\
-mintel64 accept only Intel64 ISA\n"));

12
gas/doc/c-i386.texi
View File

@ -327,6 +327,18 @@ single-thread computers
@option{-momit-lock-prefix=@var{no}} will encode lock prefix as usual,
which is the default.
@cindex @samp{-mfence-as-lock-add=} option, i386
@cindex @samp{-mfence-as-lock-add=} option, x86-64
@item -mfence-as-lock-add=@var{no}
@itemx -mfence-as-lock-add=@var{yes}
These options control how the assembler should encode lfence, mfence and
sfence.
@option{-mfence-as-lock-add=@var{yes}} will encode lfence, mfence and
sfence as @samp{lock addl $0x0, (%rsp)} in 64-bit mode and
@samp{lock addl $0x0, (%esp)} in 32-bit mode.
@option{-mfence-as-lock-add=@var{no}} will encode lfence, mfence and
sfence as usual, which is the default.
@cindex @samp{-mevexrcig=} option, i386
@cindex @samp{-mevexrcig=} option, x86-64
@item -mevexrcig=@var{rne}

14
gas/testsuite/gas/i386/fence-as-lock-add-no.d Normal file
View File

@ -0,0 +1,14 @@
#source: fence-as-lock-add.s
#as: -mfence-as-lock-add=no
#objdump: -dw
#name: i386 fence as lock add = no
.*: +file format .*i386.*
Disassembly of section .text:
0+ <main>:
[ ]*[a-f0-9]+: 0f ae e8[ ]* lfence
[ ]*[a-f0-9]+: 0f ae f0[ ]* mfence
[ ]*[a-f0-9]+: 0f ae f8[ ]* sfence
#pass

14
gas/testsuite/gas/i386/fence-as-lock-add-yes.d Normal file
View File

@ -0,0 +1,14 @@
#source: fence-as-lock-add.s
#as: -mfence-as-lock-add=yes
#objdump: -dw
#name: i386 fence as lock add = yes
.*: +file format .*i386.*
Disassembly of section .text:
0+ <main>:
[ ]*[a-f0-9]+: f0 83 04 24 00[ ]* lock addl \$0x0,\(%esp\)
[ ]*[a-f0-9]+: f0 83 04 24 00[ ]* lock addl \$0x0,\(%esp\)
[ ]*[a-f0-9]+: f0 83 04 24 00[ ]* lock addl \$0x0,\(%esp\)
#pass

6
gas/testsuite/gas/i386/fence-as-lock-add.s Normal file
View File

@ -0,0 +1,6 @@
.text
.globl main
main:
lfence
mfence
sfence

4
gas/testsuite/gas/i386/i386.exp
View File

@ -303,6 +303,8 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_32_check]]
run_dump_test "avx512dq_vl"
run_dump_test "omit-lock-yes"
run_dump_test "omit-lock-no"
run_dump_test "fence-as-lock-add-yes"
run_dump_test "fence-as-lock-add-no"
run_dump_test "avx512dq-rcigrd-intel"
run_dump_test "avx512dq-rcigrd"
run_dump_test "avx512dq-rcigrne-intel"
@ -731,6 +733,8 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
run_dump_test "x86-64-mwaitx-bdver4"
run_list_test "x86-64-mwaitx-reg"
run_dump_test "x86-64-ospke"
run_dump_test "x86-64-fence-as-lock-add-yes"
run_dump_test "x86-64-fence-as-lock-add-no"
if { ![istarget "*-*-aix*"]
&& ![istarget "*-*-beos*"]

14
gas/testsuite/gas/i386/x86-64-fence-as-lock-add-no.d Normal file
View File

@ -0,0 +1,14 @@
#source: fence-as-lock-add.s
#as: -mfence-as-lock-add=no
#objdump: -dw
#name: x86-64 fence as lock add = no
.*: +file format .*
Disassembly of section .text:
0+ <main>:
[ ]*[a-f0-9]+: 0f ae e8[ ]* lfence
[ ]*[a-f0-9]+: 0f ae f0[ ]* mfence
[ ]*[a-f0-9]+: 0f ae f8[ ]* sfence
#pass

14
gas/testsuite/gas/i386/x86-64-fence-as-lock-add-yes.d Normal file
View File

@ -0,0 +1,14 @@
#source: fence-as-lock-add.s
#as: -mfence-as-lock-add=yes
#objdump: -dw
#name: x86-64 fence as lock add = yes
.*: +file format .*
Disassembly of section .text:
0+ <main>:
[ ]*[a-f0-9]+: f0 83 04 24 00[ ]* lock addl \$0x0,\(%rsp\)
[ ]*[a-f0-9]+: f0 83 04 24 00[ ]* lock addl \$0x0,\(%rsp\)
[ ]*[a-f0-9]+: f0 83 04 24 00[ ]* lock addl \$0x0,\(%rsp\)
#pass