From 7181bcdbac1dddb06cdcd713fe34cd3983acec7f Mon Sep 17 00:00:00 2001 From: Marco Antognini Date: Wed, 17 Feb 2021 17:05:09 +0000 Subject: [PATCH] Rename files for consistency (#1166) Signed-off-by: Marco Antognini --- test_conformance/math_brute_force/CMakeLists.txt | 8 ++++---- test_conformance/math_brute_force/binary.cpp | 4 ++-- test_conformance/math_brute_force/binary_i.cpp | 4 ++-- .../{binaryOperator.cpp => binary_operator.cpp} | 4 ++-- .../math_brute_force/binary_two_results_i.cpp | 4 ++-- .../{FunctionList.cpp => function_list.cpp} | 2 +- .../math_brute_force/{FunctionList.h => function_list.h} | 4 ++-- test_conformance/math_brute_force/i_unary.cpp | 4 ++-- test_conformance/math_brute_force/macro_binary.cpp | 4 ++-- test_conformance/math_brute_force/macro_unary.cpp | 4 ++-- test_conformance/math_brute_force/mad.cpp | 4 ++-- test_conformance/math_brute_force/main.cpp | 6 +++--- test_conformance/math_brute_force/reference_math.cpp | 2 +- .../math_brute_force/{Sleep.cpp => sleep.cpp} | 4 ++-- test_conformance/math_brute_force/{Sleep.h => sleep.h} | 0 test_conformance/math_brute_force/ternary.cpp | 4 ++-- test_conformance/math_brute_force/unary.cpp | 4 ++-- test_conformance/math_brute_force/unary_two_results.cpp | 4 ++-- test_conformance/math_brute_force/unary_two_results_i.cpp | 4 ++-- test_conformance/math_brute_force/unary_u.cpp | 4 ++-- .../math_brute_force/{Utility.cpp => utility.cpp} | 6 +++--- .../math_brute_force/{Utility.h => utility.h} | 0 test_conformance/spir/CMakeLists.txt | 2 +- test_conformance/spir/run_build_test.cpp | 6 +++--- test_conformance/spirv_new/CMakeLists.txt | 4 ++-- 25 files changed, 48 insertions(+), 48 deletions(-) rename test_conformance/math_brute_force/{binaryOperator.cpp => binary_operator.cpp} (99%) rename test_conformance/math_brute_force/{FunctionList.cpp => function_list.cpp} (99%) rename test_conformance/math_brute_force/{FunctionList.h => function_list.h} (98%) rename test_conformance/math_brute_force/{Sleep.cpp => sleep.cpp} (98%) rename test_conformance/math_brute_force/{Sleep.h => sleep.h} (100%) rename test_conformance/math_brute_force/{Utility.cpp => utility.cpp} (98%) rename test_conformance/math_brute_force/{Utility.h => utility.h} (100%) diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt index 88180394..957233ca 100644 --- a/test_conformance/math_brute_force/CMakeLists.txt +++ b/test_conformance/math_brute_force/CMakeLists.txt @@ -1,24 +1,24 @@ set(MODULE_NAME BRUTEFORCE) set(${MODULE_NAME}_SOURCES - FunctionList.cpp - Sleep.cpp binary.cpp - binaryOperator.cpp - Utility.cpp binary_i.cpp + binary_operator.cpp binary_two_results_i.cpp + function_list.cpp i_unary.cpp macro_binary.cpp macro_unary.cpp mad.cpp main.cpp reference_math.cpp + sleep.cpp ternary.cpp unary.cpp unary_two_results.cpp unary_two_results_i.cpp unary_u.cpp + utility.cpp ) if (NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID) diff --git a/test_conformance/math_brute_force/binary.cpp b/test_conformance/math_brute_force/binary.cpp index c6c49359..343482cc 100644 --- a/test_conformance/math_brute_force/binary.cpp +++ b/test_conformance/math_brute_force/binary.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestFunc_Float_Float_Float(const Func *f, MTdata, bool relaxedMode); int TestFunc_Double_Double_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/binary_i.cpp b/test_conformance/math_brute_force/binary_i.cpp index db2bf8e1..5929f1d9 100644 --- a/test_conformance/math_brute_force/binary_i.cpp +++ b/test_conformance/math_brute_force/binary_i.cpp @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include #include -#include "FunctionList.h" int TestFunc_Float_Float_Int(const Func *f, MTdata, bool relaxedMode); int TestFunc_Double_Double_Int(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/binaryOperator.cpp b/test_conformance/math_brute_force/binary_operator.cpp similarity index 99% rename from test_conformance/math_brute_force/binaryOperator.cpp rename to test_conformance/math_brute_force/binary_operator.cpp index c99cf870..56cb8eb8 100644 --- a/test_conformance/math_brute_force/binaryOperator.cpp +++ b/test_conformance/math_brute_force/binary_operator.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestFunc_Float_Float_Float_Operator(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/binary_two_results_i.cpp b/test_conformance/math_brute_force/binary_two_results_i.cpp index ee87bc84..08ac3b4a 100644 --- a/test_conformance/math_brute_force/binary_two_results_i.cpp +++ b/test_conformance/math_brute_force/binary_two_results_i.cpp @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include #include -#include "FunctionList.h" int TestFunc_FloatI_Float_Float(const Func *f, MTdata, bool relaxedMode); int TestFunc_DoubleI_Double_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/FunctionList.cpp b/test_conformance/math_brute_force/function_list.cpp similarity index 99% rename from test_conformance/math_brute_force/FunctionList.cpp rename to test_conformance/math_brute_force/function_list.cpp index c5185c6f..2076aa68 100644 --- a/test_conformance/math_brute_force/FunctionList.cpp +++ b/test_conformance/math_brute_force/function_list.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "FunctionList.h" +#include "function_list.h" #include "reference_math.h" #define FTZ_ON 1 diff --git a/test_conformance/math_brute_force/FunctionList.h b/test_conformance/math_brute_force/function_list.h similarity index 98% rename from test_conformance/math_brute_force/FunctionList.h rename to test_conformance/math_brute_force/function_list.h index e47eb729..38f739ce 100644 --- a/test_conformance/math_brute_force/FunctionList.h +++ b/test_conformance/math_brute_force/function_list.h @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#ifndef FUNCTIONLIST_H -#define FUNCTIONLIST_H +#ifndef FUNCTION_LIST_H +#define FUNCTION_LIST_H #include "harness/compat.h" diff --git a/test_conformance/math_brute_force/i_unary.cpp b/test_conformance/math_brute_force/i_unary.cpp index cd5e2fa8..038e769f 100644 --- a/test_conformance/math_brute_force/i_unary.cpp +++ b/test_conformance/math_brute_force/i_unary.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestFunc_Int_Float(const Func *f, MTdata, bool relaxedMode); int TestFunc_Int_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/macro_binary.cpp b/test_conformance/math_brute_force/macro_binary.cpp index 46ba413e..09e0c6eb 100644 --- a/test_conformance/math_brute_force/macro_binary.cpp +++ b/test_conformance/math_brute_force/macro_binary.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestMacro_Int_Float_Float(const Func *f, MTdata, bool relaxedMode); int TestMacro_Int_Double_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/macro_unary.cpp b/test_conformance/math_brute_force/macro_unary.cpp index 1c8275c0..34827c03 100644 --- a/test_conformance/math_brute_force/macro_unary.cpp +++ b/test_conformance/math_brute_force/macro_unary.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestMacro_Int_Float(const Func *f, MTdata, bool relaxedMode); int TestMacro_Int_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/mad.cpp b/test_conformance/math_brute_force/mad.cpp index f1b13bd3..b0247b94 100644 --- a/test_conformance/math_brute_force/mad.cpp +++ b/test_conformance/math_brute_force/mad.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestFunc_mad(const Func *f, MTdata, bool relaxedMode); int TestFunc_mad_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/main.cpp b/test_conformance/math_brute_force/main.cpp index 82248da2..5074eb62 100644 --- a/test_conformance/math_brute_force/main.cpp +++ b/test_conformance/math_brute_force/main.cpp @@ -13,14 +13,14 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "sleep.h" +#include "utility.h" #include #include #include #include -#include "FunctionList.h" -#include "Sleep.h" #include "harness/errorHelpers.h" #include "harness/kernelHelpers.h" diff --git a/test_conformance/math_brute_force/reference_math.cpp b/test_conformance/math_brute_force/reference_math.cpp index cfa54176..cd1967db 100644 --- a/test_conformance/math_brute_force/reference_math.cpp +++ b/test_conformance/math_brute_force/reference_math.cpp @@ -21,7 +21,7 @@ #include #endif -#include "Utility.h" +#include "utility.h" #if defined(__SSE__) \ || (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))) diff --git a/test_conformance/math_brute_force/Sleep.cpp b/test_conformance/math_brute_force/sleep.cpp similarity index 98% rename from test_conformance/math_brute_force/Sleep.cpp rename to test_conformance/math_brute_force/sleep.cpp index 7103779e..26693814 100644 --- a/test_conformance/math_brute_force/Sleep.cpp +++ b/test_conformance/math_brute_force/sleep.cpp @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Sleep.h" -#include "Utility.h" +#include "sleep.h" +#include "utility.h" #if defined(__APPLE__) #include diff --git a/test_conformance/math_brute_force/Sleep.h b/test_conformance/math_brute_force/sleep.h similarity index 100% rename from test_conformance/math_brute_force/Sleep.h rename to test_conformance/math_brute_force/sleep.h diff --git a/test_conformance/math_brute_force/ternary.cpp b/test_conformance/math_brute_force/ternary.cpp index f05c605a..df6f9840 100644 --- a/test_conformance/math_brute_force/ternary.cpp +++ b/test_conformance/math_brute_force/ternary.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" #define CORRECTLY_ROUNDED 0 #define FLUSHED 1 diff --git a/test_conformance/math_brute_force/unary.cpp b/test_conformance/math_brute_force/unary.cpp index 0a00772d..4a1f37d9 100644 --- a/test_conformance/math_brute_force/unary.cpp +++ b/test_conformance/math_brute_force/unary.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" #if defined(__APPLE__) #include diff --git a/test_conformance/math_brute_force/unary_two_results.cpp b/test_conformance/math_brute_force/unary_two_results.cpp index 28fbf194..94ebb139 100644 --- a/test_conformance/math_brute_force/unary_two_results.cpp +++ b/test_conformance/math_brute_force/unary_two_results.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestFunc_Float2_Float(const Func *f, MTdata, bool relaxedMode); int TestFunc_Double2_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/unary_two_results_i.cpp b/test_conformance/math_brute_force/unary_two_results_i.cpp index 2eb2ef3a..a59563c0 100644 --- a/test_conformance/math_brute_force/unary_two_results_i.cpp +++ b/test_conformance/math_brute_force/unary_two_results_i.cpp @@ -13,11 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include #include -#include "FunctionList.h" int TestFunc_FloatI_Float(const Func *f, MTdata, bool relaxedMode); int TestFunc_DoubleI_Double(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/unary_u.cpp b/test_conformance/math_brute_force/unary_u.cpp index 26ceb683..bac5fb4e 100644 --- a/test_conformance/math_brute_force/unary_u.cpp +++ b/test_conformance/math_brute_force/unary_u.cpp @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" +#include "function_list.h" +#include "utility.h" #include -#include "FunctionList.h" int TestFunc_Float_UInt(const Func *f, MTdata, bool relaxedMode); int TestFunc_Double_ULong(const Func *f, MTdata, bool relaxedMode); diff --git a/test_conformance/math_brute_force/Utility.cpp b/test_conformance/math_brute_force/utility.cpp similarity index 98% rename from test_conformance/math_brute_force/Utility.cpp rename to test_conformance/math_brute_force/utility.cpp index 3d8d9baa..e47cdb25 100644 --- a/test_conformance/math_brute_force/Utility.cpp +++ b/test_conformance/math_brute_force/utility.cpp @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "Utility.h" -#include "FunctionList.h" +#include "utility.h" +#include "function_list.h" #if defined(__PPC__) // Global varaiable used to hold the FPU control register state. The FPSCR @@ -188,4 +188,4 @@ float getAllowedUlpError(const Func *f, const bool relaxed) } return ulp; -} \ No newline at end of file +} diff --git a/test_conformance/math_brute_force/Utility.h b/test_conformance/math_brute_force/utility.h similarity index 100% rename from test_conformance/math_brute_force/Utility.h rename to test_conformance/math_brute_force/utility.h diff --git a/test_conformance/spir/CMakeLists.txt b/test_conformance/spir/CMakeLists.txt index 70effa15..f65c0313 100644 --- a/test_conformance/spir/CMakeLists.txt +++ b/test_conformance/spir/CMakeLists.txt @@ -9,7 +9,7 @@ set (SPIR_SOURCES run_build_test.cpp run_services.cpp kernelargs.cpp - ../math_brute_force/FunctionList.cpp + ../math_brute_force/function_list.cpp ) add_executable(${SPIR_OUT} diff --git a/test_conformance/spir/run_build_test.cpp b/test_conformance/spir/run_build_test.cpp index cec2d275..9264d3a4 100644 --- a/test_conformance/spir/run_build_test.cpp +++ b/test_conformance/spir/run_build_test.cpp @@ -33,12 +33,12 @@ #include "harness/clImageHelper.h" #include "harness/os_helpers.h" +#include "../math_brute_force/function_list.h" +#include "datagen.h" #include "exceptions.h" #include "kernelargs.h" -#include "datagen.h" -#include "run_services.h" #include "run_build_test.h" -#include "../math_brute_force/FunctionList.h" +#include "run_services.h" #include // // Task diff --git a/test_conformance/spirv_new/CMakeLists.txt b/test_conformance/spirv_new/CMakeLists.txt index 614d5a79..7500571d 100644 --- a/test_conformance/spirv_new/CMakeLists.txt +++ b/test_conformance/spirv_new/CMakeLists.txt @@ -18,8 +18,8 @@ file(GLOB SPIRV_NEW_SOURCES "*.cpp") set(TEST_HARNESS_SOURCES ../../test_conformance/math_brute_force/reference_math.cpp - ../../test_conformance/math_brute_force/Utility.cpp - ) + ../../test_conformance/math_brute_force/utility.cpp +) set(${MODULE_NAME}_SOURCES ${SPIRV_NEW_SOURCES} ${TEST_HARNESS_SOURCES})