Inline windows/cpu_info.h into platform/cpu_info.h. Since the endianness macros are now provided by byte_order.h, we can remove all other inclusion sites.

PiperOrigin-RevId: 262288248

tensorflow/core/BUILD

@@ -673,7 +673,6 @@ cc_library(
         "//tensorflow/core/platform:stringpiece.h",
         "//tensorflow/core/platform:tstring.h",
         "//tensorflow/core/platform:types.h",
-        "//tensorflow/core/platform:windows/cpu_info.h",
     ],
     copts = tf_copts(),
     deps = tf_lib_proto_parsing_deps() + [

tensorflow/core/framework/bfloat16.h

@@ -20,10 +20,6 @@ limitations under the License.
 #include "tensorflow/core/platform/byte_order.h"
 #include "tensorflow/core/platform/types.h"
 
-#if defined(PLATFORM_WINDOWS)
-#include "tensorflow/core/platform/windows/cpu_info.h"
-#endif
-
 // Compact 16-bit encoding of floating point numbers. This representation uses
 // 1 bit for the sign, 8 bits for the exponent and 7 bits for the mantissa.  It
 // is assumed that floats are in IEEE 754 format so the representation is just

tensorflow/core/kernels/sparse_matmul_op.h

@@ -21,7 +21,6 @@ limitations under the License.
 #include "tensorflow/core/platform/types.h"
 
 #if defined(PLATFORM_WINDOWS)
-#include "tensorflow/core/platform/windows/cpu_info.h"
 #include "tensorflow/core/platform/windows/intrinsics_port.h"
 #endif
 

tensorflow/core/platform/cpu_info.h

@@ -23,7 +23,8 @@ limitations under the License.
 #include "tensorflow/core/platform/byte_order.h"
 
 #if defined(_MSC_VER)
-#include "tensorflow/core/platform/windows/cpu_info.h"
+// included so __cpuidex function is available for GETCPUID on Windows
+#include <intrin.h>
 #endif
 
 namespace tensorflow {

tensorflow/core/platform/windows/cpu_info.h

@@ -1,22 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_CORE_PLATFORM_WINDOWS_CPU_INFO_H_
-#define TENSORFLOW_CORE_PLATFORM_WINDOWS_CPU_INFO_H_
-
-// included so __cpuidex function is available for GETCPUID on Windows
-#include <intrin.h>
-
-#endif  // TENSORFLOW_CORE_PLATFORM_WINDOWS_CPU_INFO_H_