From b5a0fbd55d25df4785839244346d65031b550f90 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Tue, 15 Jan 2019 17:23:36 +0000 Subject: Revert "[X86] Make _xgetbv/_xsetbv on non-windows platforms" This reverts commit r351160. Breaks building v8. --- clang/test/CodeGen/builtins-x86.c | 2 -- clang/test/CodeGen/x86_32-xsave.c | 54 ++--------------------------- clang/test/CodeGen/x86_64-xsave.c | 72 ++------------------------------------- clang/test/Headers/ms-intrin.cpp | 2 -- 4 files changed, 4 insertions(+), 126 deletions(-) (limited to 'clang/test') diff --git a/clang/test/CodeGen/builtins-x86.c b/clang/test/CodeGen/builtins-x86.c index e237bc2d12b..fd99dd2be31 100644 --- a/clang/test/CodeGen/builtins-x86.c +++ b/clang/test/CodeGen/builtins-x86.c @@ -281,8 +281,6 @@ void f0() { (void)__builtin_ia32_xsave(tmp_vp, tmp_ULLi); (void)__builtin_ia32_xsave64(tmp_vp, tmp_ULLi); - tmp_ULLi = __builtin_ia32_xgetbv(tmp_Ui); - (void)__builtin_ia32_xsetbv(tmp_Ui, tmp_ULLi); (void)__builtin_ia32_xrstor(tmp_vp, tmp_ULLi); (void)__builtin_ia32_xrstor64(tmp_vp, tmp_ULLi); (void)__builtin_ia32_xsaveopt(tmp_vp, tmp_ULLi); diff --git a/clang/test/CodeGen/x86_32-xsave.c b/clang/test/CodeGen/x86_32-xsave.c index e1acdff1240..f5d84e2d920 100644 --- a/clang/test/CodeGen/x86_32-xsave.c +++ b/clang/test/CodeGen/x86_32-xsave.c @@ -1,9 +1,6 @@ // RUN: %clang_cc1 %s -DTEST_XSAVE -O0 -triple=i686-unknown-unknown -target-feature +xsave -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVE // RUN: %clang_cc1 %s -DTEST_XSAVE -O0 -triple=i686-unknown-unknown -target-feature +xsave -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVE -// RUN: %clang_cc1 %s -DTEST_XGETBV -O0 -triple=i686-unknown-unknown -target-feature +xsave -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XGETBV -// RUN: %clang_cc1 %s -DTEST_XSETBV -O0 -triple=i686-unknown-unknown -target-feature +xsave -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSETBV - // RUN: %clang_cc1 %s -DTEST_XSAVEOPT -O0 -triple=i686-unknown-unknown -target-feature +xsave -target-feature +xsaveopt -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVEOPT // RUN: %clang_cc1 %s -DTEST_XSAVEOPT -O0 -triple=i686-unknown-unknown -target-feature +xsave -target-feature +xsaveopt -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVEOPT @@ -13,15 +10,9 @@ // RUN: %clang_cc1 %s -DTEST_XSAVES -O0 -triple=i686-unknown-unknown -target-feature +xsave -target-feature +xsaves -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVES // RUN: %clang_cc1 %s -DTEST_XSAVES -O0 -triple=i686-unknown-unknown -target-feature +xsave -target-feature +xsaves -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVES -// Don't include mm_malloc.h, it's system specific. -#define __MM_MALLOC_H -#include - void test() { - unsigned long long tmp_ULLi; - unsigned int tmp_Ui; - void* tmp_vp; - tmp_ULLi = 0; tmp_Ui = 0; tmp_vp = 0; + unsigned long long tmp_ULLi = 0; + void* tmp_vp = 0; #ifdef TEST_XSAVE // XSAVE: [[tmp_vp_1:%[0-9a-zA-Z]+]] = load i8*, i8** %tmp_vp, align 4 @@ -39,12 +30,6 @@ void test() { // XSAVE: [[low32_3:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_3]] to i32 // XSAVE: call void @llvm.x86.xrstor(i8* [[tmp_vp_3]], i32 [[high32_3]], i32 [[low32_3]]) (void)__builtin_ia32_xrstor(tmp_vp, tmp_ULLi); - -// XSAVE: call void @llvm.x86.xsave - (void)_xsave(tmp_vp, tmp_ULLi); - -// XSAVE: call void @llvm.x86.xrstor - (void)_xrstor(tmp_vp, tmp_ULLi); #endif #ifdef TEST_XSAVEOPT @@ -55,9 +40,6 @@ void test() { // XSAVEOPT: [[low32_1:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_1]] to i32 // XSAVEOPT: call void @llvm.x86.xsaveopt(i8* [[tmp_vp_1]], i32 [[high32_1]], i32 [[low32_1]]) (void)__builtin_ia32_xsaveopt(tmp_vp, tmp_ULLi); - -// XSAVEOPT: call void @llvm.x86.xsaveopt - (void)_xsaveopt(tmp_vp, tmp_ULLi); #endif #ifdef TEST_XSAVEC @@ -68,9 +50,6 @@ void test() { // XSAVEC: [[low32_1:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_1]] to i32 // XSAVEC: call void @llvm.x86.xsavec(i8* [[tmp_vp_1]], i32 [[high32_1]], i32 [[low32_1]]) (void)__builtin_ia32_xsavec(tmp_vp, tmp_ULLi); - -// XSAVEC: call void @llvm.x86.xsavec - (void)_xsavec(tmp_vp, tmp_ULLi); #endif #ifdef TEST_XSAVES @@ -89,34 +68,5 @@ void test() { // XSAVES: [[low32_3:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_3]] to i32 // XSAVES: call void @llvm.x86.xrstors(i8* [[tmp_vp_3]], i32 [[high32_3]], i32 [[low32_3]]) (void)__builtin_ia32_xrstors(tmp_vp, tmp_ULLi); - -// XSAVES: call void @llvm.x86.xsaves - (void)_xsaves(tmp_vp, tmp_ULLi); - -// XSAVES: call void @llvm.x86.xrstors - (void)_xrstors(tmp_vp, tmp_ULLi); -#endif - -#ifdef TEST_XGETBV -// XGETBV: [[tmp_Ui:%[0-9a-zA-z]+]] = load i32, i32* %tmp_Ui, align 4 -// XGETBV: call i64 @llvm.x86.xgetbv(i32 [[tmp_Ui]]) - tmp_ULLi = __builtin_ia32_xgetbv(tmp_Ui); - -// XGETBV: call i64 @llvm.x86.xgetbv - tmp_ULLi = _xgetbv(tmp_Ui); -#endif - -#ifdef TEST_XSETBV -// XSETBV: [[tmp_Ui:%[0-9a-zA-z]+]] = load i32, i32* %tmp_Ui, align 4 -// XSETBV: [[tmp_ULLi_3:%[0-9a-zA-z]+]] = load i64, i64* %tmp_ULLi, align 8 -// XSETBV: [[high64_3:%[0-9a-zA-z]+]] = lshr i64 [[tmp_ULLi_3]], 32 -// XSETBV: [[high32_3:%[0-9a-zA-z]+]] = trunc i64 [[high64_3]] to i32 -// XSETBV: [[low32_3:%[0-9a-zA-z]+]] = trunc i64 [[tmp_ULLi_3]] to i32 -// XSETBV: call void @llvm.x86.xsetbv(i32 [[tmp_Ui]], i32 [[high32_3]], i32 [[low32_3]]) - (void)__builtin_ia32_xsetbv(tmp_Ui, tmp_ULLi); - - // XSETBV: call void @llvm.x86.xsetbv - (void)_xsetbv(tmp_Ui, tmp_ULLi); #endif - } diff --git a/clang/test/CodeGen/x86_64-xsave.c b/clang/test/CodeGen/x86_64-xsave.c index cfc33cb0672..beb775c0e47 100644 --- a/clang/test/CodeGen/x86_64-xsave.c +++ b/clang/test/CodeGen/x86_64-xsave.c @@ -1,9 +1,6 @@ // RUN: %clang_cc1 %s -DTEST_XSAVE -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVE // RUN: %clang_cc1 %s -DTEST_XSAVE -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVE -// RUN: %clang_cc1 %s -DTEST_XGETBV -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XGETBV -// RUN: %clang_cc1 %s -DTEST_XSETBV -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSETBV - // RUN: %clang_cc1 %s -DTEST_XSAVEOPT -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -target-feature +xsaveopt -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVEOPT // RUN: %clang_cc1 %s -DTEST_XSAVEOPT -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -target-feature +xsaveopt -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVEOPT @@ -13,16 +10,9 @@ // RUN: %clang_cc1 %s -DTEST_XSAVES -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -target-feature +xsaves -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVES // RUN: %clang_cc1 %s -DTEST_XSAVES -O0 -triple=x86_64-unknown-unknown -target-feature +xsave -target-feature +xsaves -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=XSAVES -// Don't include mm_malloc.h, it's system specific. -#define __MM_MALLOC_H -#include - - void test() { - unsigned long long tmp_ULLi; - unsigned int tmp_Ui; - void* tmp_vp; - tmp_ULLi = 0; tmp_Ui = 0; tmp_vp = 0; + unsigned long long tmp_ULLi = 0; + void* tmp_vp = 0; #ifdef TEST_XSAVE // XSAVE: [[tmp_vp_1:%[0-9a-zA-Z]+]] = load i8*, i8** %tmp_vp, align 8 @@ -56,18 +46,6 @@ void test() { // XSAVE: [[low32_4:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_4]] to i32 // XSAVE: call void @llvm.x86.xrstor64(i8* [[tmp_vp_4]], i32 [[high32_4]], i32 [[low32_4]]) (void)__builtin_ia32_xrstor64(tmp_vp, tmp_ULLi); - -// XSAVE: call void @llvm.x86.xsave - (void)_xsave(tmp_vp, tmp_ULLi); - -// XSAVE: call void @llvm.x86.xsave64 - (void)_xsave64(tmp_vp, tmp_ULLi); - -// XSAVE: call void @llvm.x86.xrstor - (void)_xrstor(tmp_vp, tmp_ULLi); - -// XSAVE: call void @llvm.x86.xrstor64 - (void)_xrstor64(tmp_vp, tmp_ULLi); #endif #ifdef TEST_XSAVEOPT @@ -86,12 +64,6 @@ void test() { // XSAVEOPT: [[low32_2:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_2]] to i32 // XSAVEOPT: call void @llvm.x86.xsaveopt64(i8* [[tmp_vp_2]], i32 [[high32_2]], i32 [[low32_2]]) (void)__builtin_ia32_xsaveopt64(tmp_vp, tmp_ULLi); - -// XSAVEOPT: call void @llvm.x86.xsaveopt - (void)_xsaveopt(tmp_vp, tmp_ULLi); - -// XSAVEOPT: call void @llvm.x86.xsaveopt64 - (void)_xsaveopt64(tmp_vp, tmp_ULLi); #endif #ifdef TEST_XSAVEC @@ -110,12 +82,6 @@ void test() { // XSAVEC: [[low32_2:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_2]] to i32 // XSAVEC: call void @llvm.x86.xsavec64(i8* [[tmp_vp_2]], i32 [[high32_2]], i32 [[low32_2]]) (void)__builtin_ia32_xsavec64(tmp_vp, tmp_ULLi); - -// XSAVEC: call void @llvm.x86.xsavec - (void)_xsavec(tmp_vp, tmp_ULLi); - -// XSAVEC: call void @llvm.x86.xsavec64 - (void)_xsavec64(tmp_vp, tmp_ULLi); #endif #ifdef TEST_XSAVES @@ -150,39 +116,5 @@ void test() { // XSAVES: [[low32_4:%[0-9a-zA-Z]+]] = trunc i64 [[tmp_ULLi_4]] to i32 // XSAVES: call void @llvm.x86.xrstors64(i8* [[tmp_vp_4]], i32 [[high32_4]], i32 [[low32_4]]) (void)__builtin_ia32_xrstors64(tmp_vp, tmp_ULLi); - -// XSAVES: call void @llvm.x86.xsaves - (void)_xsaves(tmp_vp, tmp_ULLi); - -// XSAVES: call void @llvm.x86.xsaves64 - (void)_xsaves64(tmp_vp, tmp_ULLi); - -// XSAVES: call void @llvm.x86.xrstors - (void)_xrstors(tmp_vp, tmp_ULLi); - -// XSAVES: call void @llvm.x86.xrstors64 - (void)_xrstors64(tmp_vp, tmp_ULLi); -#endif - -#ifdef TEST_XGETBV -// XGETBV: [[tmp_Ui:%[0-9a-zA-z]+]] = load i32, i32* %tmp_Ui, align 4 -// XGETBV: call i64 @llvm.x86.xgetbv(i32 [[tmp_Ui]]) - tmp_ULLi = __builtin_ia32_xgetbv(tmp_Ui); - -// XGETBV: call i64 @llvm.x86.xgetbv - tmp_ULLi = _xgetbv(tmp_Ui); -#endif - -#ifdef TEST_XSETBV -// XSETBV: [[tmp_Ui:%[0-9a-zA-z]+]] = load i32, i32* %tmp_Ui, align 4 -// XSETBV: [[tmp_ULLi_3:%[0-9a-zA-z]+]] = load i64, i64* %tmp_ULLi, align 8 -// XSETBV: [[high64_3:%[0-9a-zA-z]+]] = lshr i64 [[tmp_ULLi_3]], 32 -// XSETBV: [[high32_3:%[0-9a-zA-z]+]] = trunc i64 [[high64_3]] to i32 -// XSETBV: [[low32_3:%[0-9a-zA-z]+]] = trunc i64 [[tmp_ULLi_3]] to i32 -// XSETBV: call void @llvm.x86.xsetbv(i32 [[tmp_Ui]], i32 [[high32_3]], i32 [[low32_3]]) - (void)__builtin_ia32_xsetbv(tmp_Ui, tmp_ULLi); - - // XSETBV: call void @llvm.x86.xsetbv - (void)_xsetbv(tmp_Ui, tmp_ULLi); #endif } diff --git a/clang/test/Headers/ms-intrin.cpp b/clang/test/Headers/ms-intrin.cpp index 18bb7982037..b0fef9cc06a 100644 --- a/clang/test/Headers/ms-intrin.cpp +++ b/clang/test/Headers/ms-intrin.cpp @@ -49,9 +49,7 @@ void f() { int info[4]; __cpuid(info, 0); __cpuidex(info, 0, 0); -#if defined(_M_X64) || defined(_M_IX86) _xgetbv(0); -#endif __halt(); __nop(); __readmsr(0); -- cgit v1.2.3