Reverts refactoring of CPU feature detection for

runtime/vm/assembler_ia32_test.cc

Index: runtime/vm/assembler_ia32_test.cc
===================================================================
--- runtime/vm/assembler_ia32_test.cc	(revision 32559)
+++ runtime/vm/assembler_ia32_test.cc	(working copy)
@@ -6,7 +6,6 @@
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
-#include "vm/cpu.h"
 #include "vm/os.h"
 #include "vm/unit_test.h"
 #include "vm/virtual_memory.h"
@@ -2809,7 +2808,7 @@
 
 
 ASSEMBLER_TEST_GENERATE(Pextrd0, assembler) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     __ movsd(XMM0, Address(ESP, kWordSize));
     __ pextrd(EAX, XMM0, Immediate(0));
   }
@@ -2818,7 +2817,7 @@
 
 
 ASSEMBLER_TEST_RUN(Pextrd0, test) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     typedef int32_t (*PextrdCode0)(double d);
     int32_t res = reinterpret_cast<PextrdCode0>(test->entry())(123456789);
     EXPECT_EQ(0x54000000, res);
@@ -2827,7 +2826,7 @@
 
 
 ASSEMBLER_TEST_GENERATE(Pextrd1, assembler) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     __ movsd(XMM0, Address(ESP, kWordSize));
     __ pextrd(EAX, XMM0, Immediate(1));
   }
@@ -2836,7 +2835,7 @@
 
 
 ASSEMBLER_TEST_RUN(Pextrd1, test) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     typedef int32_t (*PextrdCode1)(double d);
     int32_t res = reinterpret_cast<PextrdCode1>(test->entry())(123456789);
     EXPECT_EQ(0x419d6f34, res);
@@ -2845,7 +2844,7 @@
 
 
 ASSEMBLER_TEST_GENERATE(Pmovsxdq, assembler) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     __ movsd(XMM0, Address(ESP, kWordSize));
     __ pmovsxdq(XMM0, XMM0);
     __ pextrd(EAX, XMM0, Immediate(1));
@@ -2855,7 +2854,7 @@
 
 
 ASSEMBLER_TEST_RUN(Pmovsxdq, test) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     typedef int32_t (*PmovsxdqCode)(double d);
     int32_t res = reinterpret_cast<PmovsxdqCode>(test->entry())(123456789);
     EXPECT_EQ(0, res);
@@ -2864,7 +2863,7 @@
 
 
 ASSEMBLER_TEST_GENERATE(Pcmpeqq, assembler) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     __ movsd(XMM0, Address(ESP, kWordSize));
     __ xorpd(XMM1, XMM1);
     __ pcmpeqq(XMM0, XMM1);
@@ -2875,7 +2874,7 @@
 
 
 ASSEMBLER_TEST_RUN(Pcmpeqq, test) {
-  if (TargetCPUFeatures::sse4_1_supported()) {
+  if (CPUFeatures::sse4_1_supported()) {
     typedef int32_t (*PcmpeqqCode)(double d);
     int32_t res = reinterpret_cast<PcmpeqqCode>(test->entry())(0);
     EXPECT_EQ(-1, res);