OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/24879 ([4.1]: SSE3 monitor intrinsic doesn't work in 64bit)

Browse Source 
gcc/

2006-05-07  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/24879
	* config/i386/pmmintrin.h (_mm_monitor): Remove macro. Use
	inline function.
	(_mm_mwait): Likewise.

	* config/i386/sse.md (sse3_mwait): Replace "mwait\t%0, %1" with
	"mwait".
	(sse3_monitor): Make it 32bit only.
	(sse3_monitor64): New. 64bit monitor.

gcc/testsuite/

2006-05-07  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/24879
	* gcc.target/i386/monitor.c: New file.

From-SVN: r113617
This commit is contained in:
H.J. Lu 2006-05-08 03:43:07 +00:00 committed by H.J. Lu
parent 0b913ffcd3
commit 67a4b39110
5 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ChangeLog
View File

@ -1,3 +1,15 @@
2006-05-07 H.J. Lu <hongjiu.lu@intel.com>
PR target/24879
* config/i386/pmmintrin.h (_mm_monitor): Remove macro. Use
inline function.
(_mm_mwait): Likewise.
* config/i386/sse.md (sse3_mwait): Replace "mwait\t%0, %1" with
"mwait".
(sse3_monitor): Make it 32bit only.
(sse3_monitor64): New. 64bit monitor.
2006-05-07 Volker Reichelt <reichelt@igpm.rwth-aachen.de> 2006-05-07 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
PR target/27421 PR target/27421

9
gcc/config/i386/pmmintrin.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. /* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
@ -25,7 +25,7 @@
Public License. */ Public License. */
/* Implemented from the specification included in the Intel C++ Compiler /* Implemented from the specification included in the Intel C++ Compiler
User Guide and Reference, version 8.0. */ User Guide and Reference, version 9.0. */
#ifndef _PMMINTRIN_H_INCLUDED #ifndef _PMMINTRIN_H_INCLUDED
#define _PMMINTRIN_H_INCLUDED #define _PMMINTRIN_H_INCLUDED
@ -110,7 +110,6 @@ _mm_lddqu_si128 (__m128i const *__P)
return (__m128i) __builtin_ia32_lddqu ((char const *)__P); return (__m128i) __builtin_ia32_lddqu ((char const *)__P);
} }
#if 0
static __inline void __attribute__((__always_inline__)) static __inline void __attribute__((__always_inline__))
_mm_monitor (void const * __P, unsigned int __E, unsigned int __H) _mm_monitor (void const * __P, unsigned int __E, unsigned int __H)
{ {
@ -122,10 +121,6 @@ _mm_mwait (unsigned int __E, unsigned int __H)
{ {
__builtin_ia32_mwait (__E, __H); __builtin_ia32_mwait (__E, __H);
} }
#else
#define _mm_monitor(P, E, H) __builtin_ia32_monitor ((P), (E), (H))
#define _mm_mwait(E, H) __builtin_ia32_mwait ((E), (H))
#endif
#endif /* __SSE3__ */ #endif /* __SSE3__ */

19
gcc/config/i386/sse.md
View File

@ -3972,7 +3972,10 @@
(match_operand:SI 1 "register_operand" "c")] (match_operand:SI 1 "register_operand" "c")]
UNSPECV_MWAIT)] UNSPECV_MWAIT)]
"TARGET_SSE3" "TARGET_SSE3"
"mwait\t%0, %1" ;; 64bit version is "mwait %rax,%rcx". But only lower 32bits are used.
;; Since 32bit register operands are implicitly zero extended to 64bit,
;; we only need to set up 32bit registers.
"mwait"
[(set_attr "length" "3")]) [(set_attr "length" "3")])
(define_insn "sse3_monitor" (define_insn "sse3_monitor"
@ -3980,6 +3983,18 @@
(match_operand:SI 1 "register_operand" "c") (match_operand:SI 1 "register_operand" "c")
(match_operand:SI 2 "register_operand" "d")] (match_operand:SI 2 "register_operand" "d")]
UNSPECV_MONITOR)] UNSPECV_MONITOR)]
"TARGET_SSE3" "TARGET_SSE3 && !TARGET_64BIT"
"monitor\t%0, %1, %2" "monitor\t%0, %1, %2"
[(set_attr "length" "3")]) [(set_attr "length" "3")])
(define_insn "sse3_monitor64"
[(unspec_volatile [(match_operand:DI 0 "register_operand" "a")
(match_operand:SI 1 "register_operand" "c")
(match_operand:SI 2 "register_operand" "d")]
UNSPECV_MONITOR)]
"TARGET_SSE3 && TARGET_64BIT"
;; 64bit version is "monitor %rax,%rcx,%rdx". But only lower 32bits in
;; RCX and RDX are used. Since 32bit register operands are implicitly
;; zero extended to 64bit, we only need to set up 32bit registers.
"monitor"
[(set_attr "length" "3")])

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2006-05-07 H.J. Lu <hongjiu.lu@intel.com>
PR target/24879
* gcc.target/i386/monitor.c: New file.
2006-05-08 Alan Modra <amodra@bigpond.net.au> 2006-05-08 Alan Modra <amodra@bigpond.net.au>
* gcc.dg/pr27095.c: xfail *-*-darwin*. * gcc.dg/pr27095.c: xfail *-*-darwin*.

27
gcc/testsuite/gcc.target/i386/monitor.c Normal file
View File

@ -0,0 +1,27 @@
/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
/* { dg-options "-O2 -msse3" } */
/* Verify that they work in both 32bit and 64bit. */
#include <pmmintrin.h>
void
foo (char *p, int x, int y, int z)
{
_mm_monitor (p, y, x);
_mm_mwait (z, y);
}
void
bar (char *p, long x, long y, long z)
{
_mm_monitor (p, y, x);
_mm_mwait (z, y);
}
void
foo1 (char *p)
{
_mm_monitor (p, 0, 0);
_mm_mwait (0, 0);
}