From 4b509a698e8c37707bb39153a77174ca3cf4f449 Mon Sep 17 00:00:00 2001 From: Steven Johnson Date: Fri, 8 Apr 2022 10:22:32 -0700 Subject: [PATCH] Upgrade to clang-format 13 Goal here: eliminate the need for a local version of llvm/clang-12, and don't stay too far behind the toolchain. As always, clang-format doesn't promise backwards compatibility, but the main differences in formatting are: - more regularization of spaces at the start of comments (I like this change) - minor difference of formatting of function-pointer-type declarations (not a fan of this, but I can't find a way to disable it and it's only really used in a handful of place in the Python bindings) --- .github/workflows/presubmit.yml | 4 +- python_bindings/src/PyBuffer.cpp | 30 +- python_bindings/src/PyFunc.cpp | 26 +- python_bindings/src/PyModule.cpp | 4 +- python_bindings/src/PyTarget.cpp | 2 +- python_bindings/src/PyType.cpp | 6 +- python_bindings/src/PyVar.cpp | 6 +- run-clang-format.sh | 14 +- src/Elf.cpp | 2 +- src/HexagonOffload.cpp | 2 +- src/IROperator.h | 18 +- src/LLVM_Runtime_Linker.cpp | 4 +- src/Lambda.h | 2 +- src/Param.h | 2 +- src/PartitionLoops.cpp | 4 +- src/Prefetch.h | 8 +- src/PythonExtensionGen.cpp | 2 +- src/RegionCosts.cpp | 6 +- src/Schedule.h | 4 +- src/WrapCalls.h | 2 +- src/autoschedulers/adams2019/Cache.h | 2 +- .../adams2019/test_function_dag.cpp | 2 +- src/autoschedulers/common/HalidePlugin.h | 2 +- src/runtime/HalideRuntimeHexagonDma.h | 6 +- src/runtime/HalideRuntimeOpenGLCompute.h | 2 +- src/runtime/hashmap.h | 2 +- src/runtime/hexagon_dma.cpp | 4 +- src/runtime/mex_functions.h | 298 +++++++++--------- src/runtime/mini_d3d12.h | 8 +- src/runtime/mini_hexagon_dma.h | 2 +- test/correctness/atomic_tuples.cpp | 2 +- test/correctness/boundary_conditions.cpp | 2 +- test/correctness/bounds_inference_chunk.cpp | 2 +- test/correctness/constraints.cpp | 2 +- test/correctness/convolution.cpp | 2 +- .../convolution_multiple_kernels.cpp | 2 +- test/correctness/extern_stage.cpp | 2 +- test/correctness/gpu_allocation_cache.cpp | 8 +- test/correctness/gpu_mixed_dimensionality.cpp | 4 +- test/correctness/image_of_lists.cpp | 6 +- test/correctness/inverse.cpp | 2 +- test/correctness/issue_3926.cpp | 2 +- test/correctness/simd_op_check_hvx.cpp | 6 +- test/correctness/strided_load.cpp | 2 +- test/correctness/tiled_matmul.cpp | 4 +- test/correctness/vector_cast.cpp | 2 +- test/error/missing_args.cpp | 4 +- test/generator/error_codes_aottest.cpp | 2 +- test/generator/float16_t_aottest.cpp | 2 +- .../performance/nested_vectorization_gemm.cpp | 2 +- test/performance/tiled_matmul.cpp | 8 +- util/HalideTraceUtils.cpp | 2 +- 52 files changed, 272 insertions(+), 274 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 5beabb6dce5f..ac65a3248ef6 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: DoozyX/clang-format-lint-action@v0.12 + - uses: DoozyX/clang-format-lint-action@v0.13 with: source: '.' extensions: 'h,c,cpp' - clangFormatVersion: 12 + clangFormatVersion: 13 check_clang_tidy: name: Check clang-tidy runs-on: ubuntu-20.04 diff --git a/python_bindings/src/PyBuffer.cpp b/python_bindings/src/PyBuffer.cpp index f1776cb4d3b2..b3d70c1f15ea 100644 --- a/python_bindings/src/PyBuffer.cpp +++ b/python_bindings/src/PyBuffer.cpp @@ -363,23 +363,23 @@ void define_buffer(py::module &m) { .def("set_name", &Buffer<>::set_name) .def("name", &Buffer<>::name) - .def("same_as", (bool (Buffer<>::*)(const Buffer<> &other) const) & Buffer<>::same_as, py::arg("other")) + .def("same_as", (bool(Buffer<>::*)(const Buffer<> &other) const) & Buffer<>::same_as, py::arg("other")) .def("defined", &Buffer<>::defined) .def("type", &Buffer<>::type) - .def("channels", (int (Buffer<>::*)() const) & Buffer<>::channels) - .def("dimensions", (int (Buffer<>::*)() const) & Buffer<>::dimensions) - .def("width", (int (Buffer<>::*)() const) & Buffer<>::width) - .def("height", (int (Buffer<>::*)() const) & Buffer<>::height) - .def("top", (int (Buffer<>::*)() const) & Buffer<>::top) - .def("bottom", (int (Buffer<>::*)() const) & Buffer<>::bottom) - .def("left", (int (Buffer<>::*)() const) & Buffer<>::left) - .def("right", (int (Buffer<>::*)() const) & Buffer<>::right) + .def("channels", (int(Buffer<>::*)() const) & Buffer<>::channels) + .def("dimensions", (int(Buffer<>::*)() const) & Buffer<>::dimensions) + .def("width", (int(Buffer<>::*)() const) & Buffer<>::width) + .def("height", (int(Buffer<>::*)() const) & Buffer<>::height) + .def("top", (int(Buffer<>::*)() const) & Buffer<>::top) + .def("bottom", (int(Buffer<>::*)() const) & Buffer<>::bottom) + .def("left", (int(Buffer<>::*)() const) & Buffer<>::left) + .def("right", (int(Buffer<>::*)() const) & Buffer<>::right) .def("number_of_elements", (size_t(Buffer<>::*)() const) & Buffer<>::number_of_elements) .def("size_in_bytes", (size_t(Buffer<>::*)() const) & Buffer<>::size_in_bytes) - .def("has_device_allocation", (bool (Buffer<>::*)() const) & Buffer<>::has_device_allocation) - .def("host_dirty", (bool (Buffer<>::*)() const) & Buffer<>::host_dirty) - .def("device_dirty", (bool (Buffer<>::*)() const) & Buffer<>::device_dirty) + .def("has_device_allocation", (bool(Buffer<>::*)() const) & Buffer<>::has_device_allocation) + .def("host_dirty", (bool(Buffer<>::*)() const) & Buffer<>::host_dirty) + .def("device_dirty", (bool(Buffer<>::*)() const) & Buffer<>::device_dirty) .def( "set_host_dirty", [](Buffer<> &b, bool dirty) -> void { @@ -395,13 +395,13 @@ void define_buffer(py::module &m) { .def("copy", &Buffer<>::copy) .def("copy_from", &Buffer<>::copy_from::AnyDims>) - .def("add_dimension", (void (Buffer<>::*)()) & Buffer<>::add_dimension) + .def("add_dimension", (void(Buffer<>::*)()) & Buffer<>::add_dimension) .def("allocate", [](Buffer<> &b) -> void { b.allocate(nullptr, nullptr); }) - .def("deallocate", (void (Buffer<>::*)()) & Buffer<>::deallocate) - .def("device_deallocate", (void (Buffer<>::*)()) & Buffer<>::device_deallocate) + .def("deallocate", (void(Buffer<>::*)()) & Buffer<>::deallocate) + .def("device_deallocate", (void(Buffer<>::*)()) & Buffer<>::device_deallocate) .def( "crop", [](Buffer<> &b, int d, int min, int extent) -> void { diff --git a/python_bindings/src/PyFunc.cpp b/python_bindings/src/PyFunc.cpp index c7cb4961eb43..c8cc43e06c58 100644 --- a/python_bindings/src/PyFunc.cpp +++ b/python_bindings/src/PyFunc.cpp @@ -186,19 +186,19 @@ void define_func(py::module &m) { .def("compile_to", &Func::compile_to, py::arg("outputs"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) - .def("compile_to_bitcode", (void (Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_bitcode, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) - .def("compile_to_bitcode", (void (Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_bitcode, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) + .def("compile_to_bitcode", (void(Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_bitcode, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) + .def("compile_to_bitcode", (void(Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_bitcode, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) - .def("compile_to_llvm_assembly", (void (Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_llvm_assembly, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) - .def("compile_to_llvm_assembly", (void (Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_llvm_assembly, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) + .def("compile_to_llvm_assembly", (void(Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_llvm_assembly, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) + .def("compile_to_llvm_assembly", (void(Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_llvm_assembly, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) - .def("compile_to_object", (void (Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_object, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) - .def("compile_to_object", (void (Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_object, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) + .def("compile_to_object", (void(Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_object, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) + .def("compile_to_object", (void(Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_object, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) .def("compile_to_header", &Func::compile_to_header, py::arg("filename"), py::arg("arguments"), py::arg("fn_name") = "", py::arg("target") = get_target_from_environment()) - .def("compile_to_assembly", (void (Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_assembly, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) - .def("compile_to_assembly", (void (Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_assembly, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) + .def("compile_to_assembly", (void(Func::*)(const std::string &, const std::vector &, const std::string &, const Target &target)) & Func::compile_to_assembly, py::arg("filename"), py::arg("arguments"), py::arg("fn_name"), py::arg("target") = get_target_from_environment()) + .def("compile_to_assembly", (void(Func::*)(const std::string &, const std::vector &, const Target &target)) & Func::compile_to_assembly, py::arg("filename"), py::arg("arguments"), py::arg("target") = get_target_from_environment()) .def("compile_to_c", &Func::compile_to_c, py::arg("filename"), py::arg("arguments"), py::arg("fn_name") = "", py::arg("target") = get_target_from_environment()) @@ -242,13 +242,13 @@ void define_func(py::module &m) { .def("is_extern", &Func::is_extern) .def("extern_function_name", &Func::extern_function_name) - .def("define_extern", (void (Func::*)(const std::string &, const std::vector &, const std::vector &, const std::vector &, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("types"), py::arg("arguments"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) + .def("define_extern", (void(Func::*)(const std::string &, const std::vector &, const std::vector &, const std::vector &, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("types"), py::arg("arguments"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) - .def("define_extern", (void (Func::*)(const std::string &, const std::vector &, Type, int, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("type"), py::arg("dimensionality"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) + .def("define_extern", (void(Func::*)(const std::string &, const std::vector &, Type, int, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("type"), py::arg("dimensionality"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) - .def("define_extern", (void (Func::*)(const std::string &, const std::vector &, const std::vector &, int, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("types"), py::arg("dimensionality"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) + .def("define_extern", (void(Func::*)(const std::string &, const std::vector &, const std::vector &, int, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("types"), py::arg("dimensionality"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) - .def("define_extern", (void (Func::*)(const std::string &, const std::vector &, Type, const std::vector &, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("type"), py::arg("arguments"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) + .def("define_extern", (void(Func::*)(const std::string &, const std::vector &, Type, const std::vector &, NameMangling, DeviceAPI)) & Func::define_extern, py::arg("function_name"), py::arg("params"), py::arg("type"), py::arg("arguments"), py::arg("mangling") = NameMangling::Default, py::arg("device_api") = DeviceAPI::Host) .def("output_buffer", &Func::output_buffer) .def("output_buffers", &Func::output_buffers) @@ -350,7 +350,7 @@ void define_func(py::module &m) { define_set(func_class); define_set(func_class); define_set(func_class); - //define_set>(func_class); + // define_set>(func_class); // LHS(Expr, ...Expr) can only be LHS of an update definition. define_set(func_class); diff --git a/python_bindings/src/PyModule.cpp b/python_bindings/src/PyModule.cpp index 10cc58cd938e..ac98de2d58e3 100644 --- a/python_bindings/src/PyModule.cpp +++ b/python_bindings/src/PyModule.cpp @@ -31,8 +31,8 @@ void define_module(py::module &m) { .def("buffers", &Module::buffers) .def("submodules", &Module::submodules) - .def("append", (void (Module::*)(const Buffer<> &)) & Module::append, py::arg("buffer")) - .def("append", (void (Module::*)(const Module &)) & Module::append, py::arg("module")) + .def("append", (void(Module::*)(const Buffer<> &)) & Module::append, py::arg("buffer")) + .def("append", (void(Module::*)(const Module &)) & Module::append, py::arg("module")) .def("compile", &Module::compile, py::arg("outputs")) diff --git a/python_bindings/src/PyTarget.cpp b/python_bindings/src/PyTarget.cpp index 13ad36e525f9..25a822948709 100644 --- a/python_bindings/src/PyTarget.cpp +++ b/python_bindings/src/PyTarget.cpp @@ -40,7 +40,7 @@ void define_target(py::module &m) { .def("__str__", &Target::to_string) .def("to_string", &Target::to_string) - .def("has_feature", (bool (Target::*)(Target::Feature) const) & Target::has_feature) + .def("has_feature", (bool(Target::*)(Target::Feature) const) & Target::has_feature) .def("features_any_of", &Target::features_any_of, py::arg("features")) .def("features_all_of", &Target::features_all_of, py::arg("features")) diff --git a/python_bindings/src/PyType.cpp b/python_bindings/src/PyType.cpp index d71c7fabf3ca..0f8c383bdf33 100644 --- a/python_bindings/src/PyType.cpp +++ b/python_bindings/src/PyType.cpp @@ -76,12 +76,12 @@ void define_type(py::module &m) { // .def("__lt__", [](const Type &value, Type *value2) -> bool { return value2 && value < *value2; }) .def("element_of", &Type::element_of) - .def("can_represent", (bool (Type::*)(Type) const) & Type::can_represent, py::arg("other")) + .def("can_represent", (bool(Type::*)(Type) const) & Type::can_represent, py::arg("other")) // Python doesn't have unsigned integers -- all integers are signed -- // so we'll never see anything that can usefully be routed to the uint64_t // overloads of these methods. - .def("is_max", (bool (Type::*)(int64_t) const) & Type::is_max, py::arg("value")) - .def("is_min", (bool (Type::*)(int64_t) const) & Type::is_min, py::arg("value")) + .def("is_max", (bool(Type::*)(int64_t) const) & Type::is_max, py::arg("value")) + .def("is_min", (bool(Type::*)(int64_t) const) & Type::is_min, py::arg("value")) .def("max", &Type::max) .def("min", &Type::min) .def("__repr__", &type_repr) diff --git a/python_bindings/src/PyVar.cpp b/python_bindings/src/PyVar.cpp index 25b2981df470..88d08a64e500 100644 --- a/python_bindings/src/PyVar.cpp +++ b/python_bindings/src/PyVar.cpp @@ -22,9 +22,9 @@ void define_var(py::module &m) { .def(py::init()) .def("name", &Var::name) .def("same_as", &Var::same_as) - .def("is_implicit", (bool (Var::*)() const) & Var::is_implicit) - .def("implicit_index", (int (Var::*)() const) & Var::implicit_index) - .def("is_placeholder", (bool (Var::*)() const) & Var::is_placeholder) + .def("is_implicit", (bool(Var::*)() const) & Var::is_implicit) + .def("implicit_index", (int(Var::*)() const) & Var::implicit_index) + .def("is_placeholder", (bool(Var::*)() const) & Var::is_placeholder) .def_static("implicit", (Var(*)(int)) & Var::implicit) .def_static("outermost", &Var::outermost) .def("__repr__", &var_repr) diff --git a/run-clang-format.sh b/run-clang-format.sh index a09cfc27e824..0982a7e37231 100755 --- a/run-clang-format.sh +++ b/run-clang-format.sh @@ -4,23 +4,23 @@ set -e ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -# We are currently standardized on using LLVM/Clang12 for this script. +# We are currently standardized on using LLVM/Clang13 for this script. # Note that this is totally independent of the version of LLVM that you -# are using to build Halide itself. If you don't have LLVM12 installed, +# are using to build Halide itself. If you don't have LLVM13 installed, # you can usually install what you need easily via: # -# sudo apt-get install llvm-12 clang-12 libclang-12-dev clang-tidy-12 -# export CLANG_FORMAT_LLVM_INSTALL_DIR=/usr/lib/llvm-12 +# sudo apt-get install llvm-13 clang-13 libclang-13-dev clang-tidy-13 +# export CLANG_FORMAT_LLVM_INSTALL_DIR=/usr/lib/llvm-13 [ -z "$CLANG_FORMAT_LLVM_INSTALL_DIR" ] && echo "CLANG_FORMAT_LLVM_INSTALL_DIR must point to an LLVM installation dir for this script." && exit echo CLANG_FORMAT_LLVM_INSTALL_DIR = ${CLANG_FORMAT_LLVM_INSTALL_DIR} VERSION=$(${CLANG_FORMAT_LLVM_INSTALL_DIR}/bin/clang-format --version) -if [[ ${VERSION} =~ .*version\ 12.* ]] +if [[ ${VERSION} =~ .*version\ 13.* ]] then - echo "clang-format version 12 found." + echo "clang-format version 13 found." else - echo "CLANG_FORMAT_LLVM_INSTALL_DIR must point to an LLVM 12 install!" + echo "CLANG_FORMAT_LLVM_INSTALL_DIR must point to an LLVM 13 install!" exit 1 fi diff --git a/src/Elf.cpp b/src/Elf.cpp index 565ebd02343c..97cbfaa90af8 100644 --- a/src/Elf.cpp +++ b/src/Elf.cpp @@ -416,7 +416,7 @@ std::unique_ptr parse_object_internal(const char *data, size_t size) { internal_assert(to_relocate != obj->sections_end()); // TODO: This assert should work, but it seems like this // isn't a reliable test. We rely on the names intead. - //internal_assert(&*to_relocate == section_map[sh->sh_link]); + // internal_assert(&*to_relocate == section_map[sh->sh_link]); for (uint64_t i = 0; i < sh->sh_size / sh->sh_entsize; i++) { const char *rela_ptr = data + sh->sh_offset + i * sh->sh_entsize; internal_assert(data <= rela_ptr && rela_ptr + sizeof(Rela) <= data + size); diff --git a/src/HexagonOffload.cpp b/src/HexagonOffload.cpp index 8ffd1d0c2e4d..896a04715b3e 100644 --- a/src/HexagonOffload.cpp +++ b/src/HexagonOffload.cpp @@ -286,7 +286,7 @@ void do_reloc(char *addr, uint32_t mask, uintptr_t val, bool is_signed, bool ver // Pull out the subinstructions. They're the low 13 // bits of each half-word. uint32_t hi = (inst >> 16) & ((1 << 13) - 1); - //uint32_t lo = inst & ((1 << 13) - 1); + // uint32_t lo = inst & ((1 << 13) - 1); // We only understand the ones where hi starts with 010 internal_assert((hi >> 10) == 2); diff --git a/src/IROperator.h b/src/IROperator.h index b528f41297b6..d2cdc6901b06 100644 --- a/src/IROperator.h +++ b/src/IROperator.h @@ -1034,21 +1034,21 @@ Expr round(Expr x); Expr trunc(Expr x); /** Returns true if the argument is a Not a Number (NaN). Requires a - * floating point argument. Vectorizes cleanly. - * Note that the Expr passed in will be evaluated in strict_float mode, - * regardless of whether strict_float mode is enabled in the current Target. */ + * floating point argument. Vectorizes cleanly. + * Note that the Expr passed in will be evaluated in strict_float mode, + * regardless of whether strict_float mode is enabled in the current Target. */ Expr is_nan(Expr x); /** Returns true if the argument is Inf or -Inf. Requires a - * floating point argument. Vectorizes cleanly. - * Note that the Expr passed in will be evaluated in strict_float mode, - * regardless of whether strict_float mode is enabled in the current Target. */ + * floating point argument. Vectorizes cleanly. + * Note that the Expr passed in will be evaluated in strict_float mode, + * regardless of whether strict_float mode is enabled in the current Target. */ Expr is_inf(Expr x); /** Returns true if the argument is a finite value (ie, neither NaN nor Inf). - * Requires a floating point argument. Vectorizes cleanly. - * Note that the Expr passed in will be evaluated in strict_float mode, - * regardless of whether strict_float mode is enabled in the current Target. */ + * Requires a floating point argument. Vectorizes cleanly. + * Note that the Expr passed in will be evaluated in strict_float mode, + * regardless of whether strict_float mode is enabled in the current Target. */ Expr is_finite(Expr x); /** Return the fractional part of a floating-point expression. If the argument diff --git a/src/LLVM_Runtime_Linker.cpp b/src/LLVM_Runtime_Linker.cpp index b73e88313132..c4be37a2b4ea 100644 --- a/src/LLVM_Runtime_Linker.cpp +++ b/src/LLVM_Runtime_Linker.cpp @@ -280,10 +280,10 @@ DECLARE_NO_INITMOD(wasm_math) #endif // WITH_WEBASSEMBLY #ifdef WITH_RISCV -//DECLARE_LL_INITMOD(riscv) +// DECLARE_LL_INITMOD(riscv) DECLARE_CPP_INITMOD(riscv_cpu_features) #else -//DECLARE_NO_INITMOD(riscv) +// DECLARE_NO_INITMOD(riscv) DECLARE_NO_INITMOD(riscv_cpu_features) #endif // WITH_RISCV diff --git a/src/Lambda.h b/src/Lambda.h index 55f883d96422..cde63b2efb68 100644 --- a/src/Lambda.h +++ b/src/Lambda.h @@ -47,4 +47,4 @@ Func lambda(const Var &x, const Var &y, const Var &z, const Var &w, const Var &v } // namespace Halide -#endif //HALIDE_LAMBDA_H +#endif // HALIDE_LAMBDA_H diff --git a/src/Param.h b/src/Param.h index 9295c45f2a04..2b2b9a0a541f 100644 --- a/src/Param.h +++ b/src/Param.h @@ -105,7 +105,7 @@ class Param { } /** Construct a scalar parameter of type T with an initial value of 'val' - * and a given min and max. */ + * and a given min and max. */ Param(not_void_T val, const Expr &min, const Expr &max) : param(type_of(), false, 0, Internal::make_entity_name(this, "Halide:.*:Param<.*>", 'p')) { static_assert(has_static_type, "Cannot use this ctor without an explicit type."); diff --git a/src/PartitionLoops.cpp b/src/PartitionLoops.cpp index 68b273a550e6..678752f248f9 100644 --- a/src/PartitionLoops.cpp +++ b/src/PartitionLoops.cpp @@ -746,14 +746,14 @@ class PartitionLoops : public IRMutator { if (make_epilogue) { // Uncomment to include code that prints the epilogue value - //epilogue_val = print(epilogue_val, op->name, "epilogue"); + // epilogue_val = print(epilogue_val, op->name, "epilogue"); stmt = LetStmt::make(epilogue_name, epilogue_val, stmt); } else { epilogue_val = op->min + op->extent; } if (make_prologue) { // Uncomment to include code that prints the prologue value - //prologue_val = print(prologue_val, op->name, "prologue"); + // prologue_val = print(prologue_val, op->name, "prologue"); stmt = LetStmt::make(prologue_name, prologue_val, stmt); } else { prologue_val = op->min; diff --git a/src/Prefetch.h b/src/Prefetch.h index 6a29ea8bcd09..1b8287f881c1 100644 --- a/src/Prefetch.h +++ b/src/Prefetch.h @@ -21,14 +21,14 @@ struct PrefetchDirective; struct Stmt; /** Inject placeholder prefetches to 's'. This placholder prefetch - * does not have explicit region to be prefetched yet. It will be computed - * during call to \ref inject_prefetch. */ + * does not have explicit region to be prefetched yet. It will be computed + * during call to \ref inject_prefetch. */ Stmt inject_placeholder_prefetch(const Stmt &s, const std::map &env, const std::string &prefix, const std::vector &prefetches); /** Compute the actual region to be prefetched and place it to the - * placholder prefetch. Wrap the prefetch call with condition when - * applicable. */ + * placholder prefetch. Wrap the prefetch call with condition when + * applicable. */ Stmt inject_prefetch(const Stmt &s, const std::map &env); /** Reduce a multi-dimensional prefetch into a prefetch of lower dimension diff --git a/src/PythonExtensionGen.cpp b/src/PythonExtensionGen.cpp index 1b762a2912bc..36865d3453b1 100644 --- a/src/PythonExtensionGen.cpp +++ b/src/PythonExtensionGen.cpp @@ -42,7 +42,7 @@ bool can_convert(const LoweredArgument *arg) { if (arg->type.is_handle()) { if (arg->name == "__user_context") { /* __user_context is a void* pointer to a user supplied memory region. - * We allow the Python callee to pass PyObject* pointers to that. */ + * We allow the Python callee to pass PyObject* pointers to that. */ return true; } else { return false; diff --git a/src/RegionCosts.cpp b/src/RegionCosts.cpp index 38ed44541edc..ddc6b45c4b2d 100644 --- a/src/RegionCosts.cpp +++ b/src/RegionCosts.cpp @@ -371,7 +371,7 @@ Expr get_func_value_size(const Function &f) { Cost compute_expr_cost(Expr expr) { // TODO: Handle likely - //expr = LikelyExpression().mutate(expr); + // expr = LikelyExpression().mutate(expr); expr = simplify(expr); ExprCost cost_visitor; expr.accept(&cost_visitor); @@ -380,7 +380,7 @@ Cost compute_expr_cost(Expr expr) { map compute_expr_detailed_byte_loads(Expr expr) { // TODO: Handle likely - //expr = LikelyExpression().mutate(expr); + // expr = LikelyExpression().mutate(expr); expr = simplify(expr); ExprCost cost_visitor; expr.accept(&cost_visitor); @@ -508,7 +508,7 @@ RegionCosts::stage_detailed_load_costs(const string &func, int stage, if (curr_f.has_extern_definition()) { // TODO(psuriana): We need a better cost for extern function - //load_costs.emplace(func, Int(64).max()); + // load_costs.emplace(func, Int(64).max()); load_costs.emplace(func, Expr()); } else { Definition def = get_stage_definition(curr_f, stage); diff --git a/src/Schedule.h b/src/Schedule.h index 0b82c8358e8e..186506cbb593 100644 --- a/src/Schedule.h +++ b/src/Schedule.h @@ -282,8 +282,8 @@ struct Split { std::string old_var, outer, inner; Expr factor; bool exact; // Is it required that the factor divides the extent - // of the old var. True for splits of RVars. Forces - // tail strategy to be GuardWithIf. + // of the old var. True for splits of RVars. Forces + // tail strategy to be GuardWithIf. TailStrategy tail; enum SplitType { SplitVar = 0, diff --git a/src/WrapCalls.h b/src/WrapCalls.h index f73ec2bf1f83..e54244bcf9f8 100644 --- a/src/WrapCalls.h +++ b/src/WrapCalls.h @@ -15,7 +15,7 @@ namespace Internal { class Function; /** Replace every call to wrapped Functions in the Functions' definitions with - * call to their wrapper functions. */ + * call to their wrapper functions. */ std::map wrap_func_calls(const std::map &env); } // namespace Internal diff --git a/src/autoschedulers/adams2019/Cache.h b/src/autoschedulers/adams2019/Cache.h index ded209bac1c1..3272691ab13f 100644 --- a/src/autoschedulers/adams2019/Cache.h +++ b/src/autoschedulers/adams2019/Cache.h @@ -48,7 +48,7 @@ namespace Autoscheduler { Computes a structural hash for use in feature caching in a LoopNest. - LoopNest::collect_producers - Collects all producers for a LoopNest for use in calculating the structural hash in + Collects all producers for a LoopNest for use in calculating the structural hash in LoopNest::compute_hash_of_producers_stored_at_root. - LoopNest::collect_stages diff --git a/src/autoschedulers/adams2019/test_function_dag.cpp b/src/autoschedulers/adams2019/test_function_dag.cpp index 933c7f9d5027..253307321ecc 100644 --- a/src/autoschedulers/adams2019/test_function_dag.cpp +++ b/src/autoschedulers/adams2019/test_function_dag.cpp @@ -76,7 +76,7 @@ void test_coeff_wise(const MachineParams ¶ms, const Target &target) { } // Disabled for now: there is still work to do to populate the jacobian - //assert(with_extern.str() == without_extern.str()); + // assert(with_extern.str() == without_extern.str()); } extern "C" int matmul( diff --git a/src/autoschedulers/common/HalidePlugin.h b/src/autoschedulers/common/HalidePlugin.h index 7e6636bb09c0..c5ffb1e16ec9 100644 --- a/src/autoschedulers/common/HalidePlugin.h +++ b/src/autoschedulers/common/HalidePlugin.h @@ -11,4 +11,4 @@ } \ } register_##NAME; -#endif //HALIDE_HALIDEPLUGIN_H +#endif // HALIDE_HALIDEPLUGIN_H diff --git a/src/runtime/HalideRuntimeHexagonDma.h b/src/runtime/HalideRuntimeHexagonDma.h index 42b1ea35dc31..3eb9c9c58b82 100644 --- a/src/runtime/HalideRuntimeHexagonDma.h +++ b/src/runtime/HalideRuntimeHexagonDma.h @@ -49,7 +49,7 @@ typedef enum { extern const struct halide_device_interface_t *halide_hexagon_dma_device_interface(); -/** This API is used to set up the DMA device interface to be used for DMA transfer. This also internally +/** This API is used to set up the DMA device interface to be used for DMA transfer. This also internally * creates the DMA device handle and populates all the Buffer related parameters (width, height, stride) * to be used for DMA configuration. */ @@ -66,7 +66,7 @@ extern int halide_hexagon_dma_device_detach_native(void *user_context, struct ha */ extern int halide_hexagon_dma_allocate_engine(void *user_context, void **dma_engine); -/** This API free up the allocated DMA engine. This need to be called after a user program ends +/** This API free up the allocated DMA engine. This need to be called after a user program ends * all the DMA Operations and make it available for subsequent DMA transfers */ extern int halide_hexagon_dma_deallocate_engine(void *user_context, void *dma_engine); @@ -83,7 +83,7 @@ extern int halide_hexagon_dma_prepare_for_copy_to_device(void *user_context, str void *dma_engine, bool is_ubwc, halide_hexagon_image_fmt_t fmt); -/** This API is used to frees up the DMA Resources associated with the buffer. +/** This API is used to frees up the DMA Resources associated with the buffer. * TODO: Currently this API is a dummy as all the necessary freeing is done in an another API. * This will be used in future. */ diff --git a/src/runtime/HalideRuntimeOpenGLCompute.h b/src/runtime/HalideRuntimeOpenGLCompute.h index decca61124f1..1b19472908ab 100644 --- a/src/runtime/HalideRuntimeOpenGLCompute.h +++ b/src/runtime/HalideRuntimeOpenGLCompute.h @@ -59,7 +59,7 @@ void *halide_opengl_get_proc_address(void *user_context, const char *name); /** This function creates an OpenGL context for use by the OpenGL backend. * * You may have to implement this yourself as well. Halide only provides -* implementations for some platforms." + * implementations for some platforms." */ int halide_opengl_create_context(void *user_context); diff --git a/src/runtime/hashmap.h b/src/runtime/hashmap.h index 479becce6f16..3c224b870963 100644 --- a/src/runtime/hashmap.h +++ b/src/runtime/hashmap.h @@ -426,4 +426,4 @@ struct THashMap : public HashMap { } // namespace Runtime } // namespace Halide -#endif //HALIDE_RUNTIME_HASHMAP_H +#endif // HALIDE_RUNTIME_HASHMAP_H diff --git a/src/runtime/hexagon_dma.cpp b/src/runtime/hexagon_dma.cpp index 4db1e81d8f93..4512abb31c72 100644 --- a/src/runtime/hexagon_dma.cpp +++ b/src/runtime/hexagon_dma.cpp @@ -163,7 +163,7 @@ void desc_pool_free(void *user_context) { // User ptovided Image format to DMA format conversion. inline t_eDmaFmt halide_hexagon_get_dma_format(void *user_context, const halide_hexagon_image_fmt_t format) { - //A giant switch case to match image formats to dma formats + // A giant switch case to match image formats to dma formats switch (format) { case halide_hexagon_fmt_NV12: return eDmaFmt_NV12; @@ -486,7 +486,7 @@ WEAK int halide_hexagon_dma_unprepare(void *user_context, struct halide_buffer_t debug(user_context) << "Hexagon: halide_hexagon_dma_unprepare (user_context: " << user_context << ", buf: " << *buf << ")\n"; - //TODO Now that FinishFrame is called by Hexagon DMA Pool Module, need to check if this function is redundant + // TODO Now that FinishFrame is called by Hexagon DMA Pool Module, need to check if this function is redundant return halide_error_code_success; } diff --git a/src/runtime/mex_functions.h b/src/runtime/mex_functions.h index e1ca89399361..ea711a314bca 100644 --- a/src/runtime/mex_functions.h +++ b/src/runtime/mex_functions.h @@ -26,171 +26,171 @@ #endif // mex.h -//MEX_FN(int, mexPrintf, (const char*, ...)); -//MEX_FN(void, mexErrMsgTxt, (const char*)); -//MEX_FN(void, mexErrMsgIdAndTxt, (const char *, const char*, ...)); +// MEX_FN(int, mexPrintf, (const char*, ...)); +// MEX_FN(void, mexErrMsgTxt, (const char*)); +// MEX_FN(void, mexErrMsgIdAndTxt, (const char *, const char*, ...)); MEX_FN(void, mexWarnMsgTxt, (const char *)); -//MEX_FN(void, mexWarnMsgIdAndTxt, (const char *, const char*, ...)); -//MEX_FN(void, mexMakeArrayPersistent, (const mxArray*)); -//MEX_FN(void, mexMakeMemoryPersistent, (void *ptr)); -//MEX_FN(int, mexSet, (double, const char*, mxArray*)); -//MEX_FN(const mxArray*, mexGet, (double, const char*)); -//MEX_FN(int, mexCallMATLAB, (int, mxArray**, int, const mxArray**, const char *)); -//MEX_FN(mxArray*, mexCallMATLABWithTrap, (int, mxArray**, int, const mxArray**, const char *)); -//MEX_FN(void, mexSetTrapFlag, (int)); -//MEX_FN(void, mexPrintAssertion, (const char*, const char*, int, const char*)); -//MEX_FN(bool, mexIsGlobal, (const mxArray*)); -//MEX_FN(int, mexPutVariable, (const char*, const char*, const mxArray*)); -//MEX_FN(const mxArray*, mexGetVariablePtr, (const char*, const char*)); -//MEX_FN(mxArray*, mexGetVariable, (const char*, const char*)); -//MEX_FN(void, mexLock, (void)); -//MEX_FN(void, mexUnlock, (void)); -//MEX_FN(bool, mexIsLocked, (void)); -//MEX_FN(const char*, mexFunctionName, (void)); -//MEX_FN(int, mexEvalString, (const char*)); -//MEX_FN(mxArray*, mexEvalStringWithTrap, (const char*)); -//MEX_FN(int, mexAtExit, (mex_exit_fn)); +// MEX_FN(void, mexWarnMsgIdAndTxt, (const char *, const char*, ...)); +// MEX_FN(void, mexMakeArrayPersistent, (const mxArray*)); +// MEX_FN(void, mexMakeMemoryPersistent, (void *ptr)); +// MEX_FN(int, mexSet, (double, const char*, mxArray*)); +// MEX_FN(const mxArray*, mexGet, (double, const char*)); +// MEX_FN(int, mexCallMATLAB, (int, mxArray**, int, const mxArray**, const char *)); +// MEX_FN(mxArray*, mexCallMATLABWithTrap, (int, mxArray**, int, const mxArray**, const char *)); +// MEX_FN(void, mexSetTrapFlag, (int)); +// MEX_FN(void, mexPrintAssertion, (const char*, const char*, int, const char*)); +// MEX_FN(bool, mexIsGlobal, (const mxArray*)); +// MEX_FN(int, mexPutVariable, (const char*, const char*, const mxArray*)); +// MEX_FN(const mxArray*, mexGetVariablePtr, (const char*, const char*)); +// MEX_FN(mxArray*, mexGetVariable, (const char*, const char*)); +// MEX_FN(void, mexLock, (void)); +// MEX_FN(void, mexUnlock, (void)); +// MEX_FN(bool, mexIsLocked, (void)); +// MEX_FN(const char*, mexFunctionName, (void)); +// MEX_FN(int, mexEvalString, (const char*)); +// MEX_FN(mxArray*, mexEvalStringWithTrap, (const char*)); +// MEX_FN(int, mexAtExit, (mex_exit_fn)); // matrix.h -//MEX_FN(void*, mxMalloc, (size_t)); -//MEX_FN(void*, mxCalloc, (size_t, size_t)); -//MEX_FN(void, mxFree, (void*)); -//MEX_FN(void*, mxRealloc, (void*, size_t)); +// MEX_FN(void*, mxMalloc, (size_t)); +// MEX_FN(void*, mxCalloc, (size_t, size_t)); +// MEX_FN(void, mxFree, (void*)); +// MEX_FN(void*, mxRealloc, (void*, size_t)); MEX_FN_730(size_t, mxGetNumberOfDimensions, mxGetNumberOfDimensions_730, (const mxArray *)); MEX_FN_700(int, mxGetNumberOfDimensions, mxGetNumberOfDimensions_700, (const mxArray *)); MEX_FN_730(const size_t *, mxGetDimensions, mxGetDimensions_730, (const mxArray *)); MEX_FN_700(const int *, mxGetDimensions, mxGetDimensions_700, (const mxArray *)); -//MEX_FN(size_t, mxGetM, (const mxArray*)); -//MEX_FN_730(size_t*, mxGetIr, mxGetIr_730, (const mxArray*)); -//MEX_FN_700(int*, mxGetIr, mxGetIr_700, (const mxArray*)); -//MEX_FN_730(size_t*, mxGetJc, mxGetJc_730, (const mxArray*)); -//MEX_FN_700(int*, mxGetJc, mxGetJc_700, (const mxArray*)); -//MEX_FN_730(size_t, mxGetNzmax, mxGetNzmax_730, (const mxArray*)); -//MEX_FN_700(int, mxGetNzmax, mxGetNzmax_700, (const mxArray*)); -//MEX_FN_730(void, mxSetNzmax, mxSetNzmax_730, (mxArray*, size_t)); -//MEX_FN_700(void, mxSetNzmax, mxSetNzmax_700, (mxArray*, int)); -//MEX_FN(const char*, mxGetFieldNameByNumber, (const mxArray*, int)); -//MEX_FN_730(mxArray*, mxGetFieldByNumber, mxGetFieldByNumber_730, (const mxArray*, size_t, int)); -//MEX_FN_700(mxArray*, mxGetFieldByNumber, mxGetFieldByNumber_700, (const mxArray*, int, int)); -//MEX_FN_730(mxArray*, mxGetCell, mxGetCell_730, (const mxArray*, size_t)); -//MEX_FN_700(mxArray*, mxGetCell, mxGetCell_700, (const mxArray*, int)); +// MEX_FN(size_t, mxGetM, (const mxArray*)); +// MEX_FN_730(size_t*, mxGetIr, mxGetIr_730, (const mxArray*)); +// MEX_FN_700(int*, mxGetIr, mxGetIr_700, (const mxArray*)); +// MEX_FN_730(size_t*, mxGetJc, mxGetJc_730, (const mxArray*)); +// MEX_FN_700(int*, mxGetJc, mxGetJc_700, (const mxArray*)); +// MEX_FN_730(size_t, mxGetNzmax, mxGetNzmax_730, (const mxArray*)); +// MEX_FN_700(int, mxGetNzmax, mxGetNzmax_700, (const mxArray*)); +// MEX_FN_730(void, mxSetNzmax, mxSetNzmax_730, (mxArray*, size_t)); +// MEX_FN_700(void, mxSetNzmax, mxSetNzmax_700, (mxArray*, int)); +// MEX_FN(const char*, mxGetFieldNameByNumber, (const mxArray*, int)); +// MEX_FN_730(mxArray*, mxGetFieldByNumber, mxGetFieldByNumber_730, (const mxArray*, size_t, int)); +// MEX_FN_700(mxArray*, mxGetFieldByNumber, mxGetFieldByNumber_700, (const mxArray*, int, int)); +// MEX_FN_730(mxArray*, mxGetCell, mxGetCell_730, (const mxArray*, size_t)); +// MEX_FN_700(mxArray*, mxGetCell, mxGetCell_700, (const mxArray*, int)); MEX_FN(mxClassID, mxGetClassID, (const mxArray *)); MEX_FN(void *, mxGetData, (const mxArray *)); -//MEX_FN(void, mxSetData, (mxArray*,void*)); +// MEX_FN(void, mxSetData, (mxArray*,void*)); MEX_FN(bool, mxIsNumeric, (const mxArray *)); -//MEX_FN(bool, mxIsCell, (const mxArray*)); +// MEX_FN(bool, mxIsCell, (const mxArray*)); MEX_FN(bool, mxIsLogical, (const mxArray *)); -//MEX_FN(bool, mxIsChar, (const mxArray*)); -//MEX_FN(bool, mxIsStruct, (const mxArray*)); -//MEX_FN(bool, mxIsOpaque, (const mxArray*)); -//MEX_FN(bool, mxIsFunctionHandle, (const mxArray*)); -//MEX_FN(bool, mxIsObject, (const mxArray*)); -//MEX_FN(void*, mxGetImagData, (const mxArray*)); -//MEX_FN(void, mxSetImagData, (mxArray*, void*)); +// MEX_FN(bool, mxIsChar, (const mxArray*)); +// MEX_FN(bool, mxIsStruct, (const mxArray*)); +// MEX_FN(bool, mxIsOpaque, (const mxArray*)); +// MEX_FN(bool, mxIsFunctionHandle, (const mxArray*)); +// MEX_FN(bool, mxIsObject, (const mxArray*)); +// MEX_FN(void*, mxGetImagData, (const mxArray*)); +// MEX_FN(void, mxSetImagData, (mxArray*, void*)); MEX_FN(bool, mxIsComplex, (const mxArray *)); -//MEX_FN(bool, mxIsSparse, (const mxArray*)); -//MEX_FN(bool, mxIsDouble, (const mxArray*)); -//MEX_FN(bool, mxIsSingle, (const mxArray*)); -//MEX_FN(bool, mxIsInt8, (const mxArray*)); -//MEX_FN(bool, mxIsUint8, (const mxArray*)); -//MEX_FN(bool, mxIsInt16, (const mxArray*)); -//MEX_FN(bool, mxIsUint16, (const mxArray*)); -//MEX_FN(bool, mxIsInt32, (const mxArray*)); -//MEX_FN(bool, mxIsUint32, (const mxArray*)); -//MEX_FN(bool, mxIsInt64, (const mxArray*)); -//MEX_FN(bool, mxIsUint64, (const mxArray*)); -//MEX_FN(size_t, mxGetNumberOfElements, (const mxArray*)); -//MEX_FN(double*, mxGetPr, (const mxArray*)); -//MEX_FN(void, mxSetPr, (mxArray*, double*)); -//MEX_FN(double*, mxGetPi, (const mxArray*)); -//MEX_FN(void, mxSetPi, (mxArray*, double*)); -//MEX_FN(mxChar*, mxGetChars, (const mxArray*)); -//MEX_FN(int, mxGetUserBits, (const mxArray*)); -//MEX_FN(void, mxSetUserBits, (mxArray*, int)); +// MEX_FN(bool, mxIsSparse, (const mxArray*)); +// MEX_FN(bool, mxIsDouble, (const mxArray*)); +// MEX_FN(bool, mxIsSingle, (const mxArray*)); +// MEX_FN(bool, mxIsInt8, (const mxArray*)); +// MEX_FN(bool, mxIsUint8, (const mxArray*)); +// MEX_FN(bool, mxIsInt16, (const mxArray*)); +// MEX_FN(bool, mxIsUint16, (const mxArray*)); +// MEX_FN(bool, mxIsInt32, (const mxArray*)); +// MEX_FN(bool, mxIsUint32, (const mxArray*)); +// MEX_FN(bool, mxIsInt64, (const mxArray*)); +// MEX_FN(bool, mxIsUint64, (const mxArray*)); +// MEX_FN(size_t, mxGetNumberOfElements, (const mxArray*)); +// MEX_FN(double*, mxGetPr, (const mxArray*)); +// MEX_FN(void, mxSetPr, (mxArray*, double*)); +// MEX_FN(double*, mxGetPi, (const mxArray*)); +// MEX_FN(void, mxSetPi, (mxArray*, double*)); +// MEX_FN(mxChar*, mxGetChars, (const mxArray*)); +// MEX_FN(int, mxGetUserBits, (const mxArray*)); +// MEX_FN(void, mxSetUserBits, (mxArray*, int)); MEX_FN(double, mxGetScalar, (const mxArray *)); -//MEX_FN(bool, mxIsFromGlobalWS, (const mxArray*)); -//MEX_FN(void, mxSetFromGlobalWS, (mxArray*, bool)); -//MEX_FN_730(void, mxSetM, mxSetM_730, (mxArray*, size_t)); -//MEX_FN_700(void, mxSetM, mxSetM_700, (mxArray*, int)); -//MEX_FN(size_t, mxGetN, (const mxArray*)); -//MEX_FN(bool, mxIsEmpty, (const mxArray*)); -//MEX_FN(int, mxGetFieldNumber, (const mxArray*, const char*)); -//MEX_FN_730(void, mxSetIr, mxSetIr_730, (mxArray*, size_t*)); -//MEX_FN_700(void, mxSetIr, mxSetIr_700, (mxArray*, int*)); -//MEX_FN_730(void, mxSetJc, mxSetJc_730, (mxArray*, size_t*)); -//MEX_FN_700(void, mxSetJc, mxSetJc_700, (mxArray*, int*)); +// MEX_FN(bool, mxIsFromGlobalWS, (const mxArray*)); +// MEX_FN(void, mxSetFromGlobalWS, (mxArray*, bool)); +// MEX_FN_730(void, mxSetM, mxSetM_730, (mxArray*, size_t)); +// MEX_FN_700(void, mxSetM, mxSetM_700, (mxArray*, int)); +// MEX_FN(size_t, mxGetN, (const mxArray*)); +// MEX_FN(bool, mxIsEmpty, (const mxArray*)); +// MEX_FN(int, mxGetFieldNumber, (const mxArray*, const char*)); +// MEX_FN_730(void, mxSetIr, mxSetIr_730, (mxArray*, size_t*)); +// MEX_FN_700(void, mxSetIr, mxSetIr_700, (mxArray*, int*)); +// MEX_FN_730(void, mxSetJc, mxSetJc_730, (mxArray*, size_t*)); +// MEX_FN_700(void, mxSetJc, mxSetJc_700, (mxArray*, int*)); MEX_FN(size_t, mxGetElementSize, (const mxArray *)); -//MEX_FN_730(size_t, mxCalcSingleSubscript, mxCalcSingleSubscript_730, (const mxArray*, size_t, const size_t*)); -//MEX_FN_700(int, mxCalcSingleSubscript, mxCalcSingleSubscript_700, (const mxArray*, int, const int*)); -//MEX_FN(int, mxGetNumberOfFields, (const mxArray*)); -//MEX_FN_730(void, mxSetCell, mxSetCell_730, (mxArray*, size_t, mxArray*)); -//MEX_FN_700(void, mxSetCell, mxSetCell_700, (mxArray*, int, mxArray*)); -//MEX_FN_730(void, mxSetFieldByNumber, mxSetFieldByNumber_730, (mxArray*, size_t, int, mxArray*)); -//MEX_FN_700(void, mxSetFieldByNumber, mxSetFieldByNumber_700, (mxArray*, int, int, mxArray*)); -//MEX_FN_730(mxArray*, mxGetField, mxGetField_730, (const mxArray*, size_t, const char*)); -//MEX_FN_700(mxArray*, mxGetField, mxGetField_700, (const mxArray*, int, const char*)); -//MEX_FN_730(void, mxSetField, mxSetField_730, (mxArray*, size_t, const char*, mxArray*)); -//MEX_FN_700(void, mxSetField, mxSetField_700, (mxArray*, int, const char*, mxArray*)); -//MEX_FN_730(mxArray*, mxGetProperty, mxGetProperty_730, (const mxArray*, const size_t, const char*)); -//MEX_FN_700(mxArray*, mxGetProperty, mxGetProperty_700, (const mxArray*, const int, const char*)); -//MEX_FN_730(void, mxSetProperty, mxSetProperty_730, (mxArray*, size_t, const char*, const mxArray*)); -//MEX_FN_700(void, mxSetProperty, mxSetProperty_700, (mxArray*, int, const char*, const mxArray*)); -//MEX_FN(const char*, mxGetClassName, (const mxArray*)); -//MEX_FN(bool, mxIsClass, (const mxArray*, const char*)); +// MEX_FN_730(size_t, mxCalcSingleSubscript, mxCalcSingleSubscript_730, (const mxArray*, size_t, const size_t*)); +// MEX_FN_700(int, mxCalcSingleSubscript, mxCalcSingleSubscript_700, (const mxArray*, int, const int*)); +// MEX_FN(int, mxGetNumberOfFields, (const mxArray*)); +// MEX_FN_730(void, mxSetCell, mxSetCell_730, (mxArray*, size_t, mxArray*)); +// MEX_FN_700(void, mxSetCell, mxSetCell_700, (mxArray*, int, mxArray*)); +// MEX_FN_730(void, mxSetFieldByNumber, mxSetFieldByNumber_730, (mxArray*, size_t, int, mxArray*)); +// MEX_FN_700(void, mxSetFieldByNumber, mxSetFieldByNumber_700, (mxArray*, int, int, mxArray*)); +// MEX_FN_730(mxArray*, mxGetField, mxGetField_730, (const mxArray*, size_t, const char*)); +// MEX_FN_700(mxArray*, mxGetField, mxGetField_700, (const mxArray*, int, const char*)); +// MEX_FN_730(void, mxSetField, mxSetField_730, (mxArray*, size_t, const char*, mxArray*)); +// MEX_FN_700(void, mxSetField, mxSetField_700, (mxArray*, int, const char*, mxArray*)); +// MEX_FN_730(mxArray*, mxGetProperty, mxGetProperty_730, (const mxArray*, const size_t, const char*)); +// MEX_FN_700(mxArray*, mxGetProperty, mxGetProperty_700, (const mxArray*, const int, const char*)); +// MEX_FN_730(void, mxSetProperty, mxSetProperty_730, (mxArray*, size_t, const char*, const mxArray*)); +// MEX_FN_700(void, mxSetProperty, mxSetProperty_700, (mxArray*, int, const char*, const mxArray*)); +// MEX_FN(const char*, mxGetClassName, (const mxArray*)); +// MEX_FN(bool, mxIsClass, (const mxArray*, const char*)); MEX_FN_730(mxArray *, mxCreateNumericMatrix, mxCreateNumericMatrix_730, (size_t, size_t, mxClassID, mxComplexity)); MEX_FN_700(mxArray *, mxCreateNumericMatrix, mxCreateNumericMatrix_700, (int, int, mxClassID, mxComplexity)); -//MEX_FN_730(void, mxSetN, mxSetN_730, (mxArray*, size_t)); -//MEX_FN_700(void, mxSetN, mxSetN_700, (mxArray*, int)); -//MEX_FN_730(int, mxSetDimensions, mxSetDimensions_730, (mxArray*, const size_t*, size_t)); -//MEX_FN_700(int, mxSetDimensions, mxSetDimensions_700, (mxArray*, const int*, int)); -//MEX_FN(void, mxDestroyArray, (mxArray*)); -//MEX_FN_730(mxArray*, mxCreateNumericArray, mxCreateNumericArray_730, (size_t, const size_t*, mxClassID, mxComplexity)); -//MEX_FN_700(mxArray*, mxCreateNumericArray, mxCreateNumericArray_700, (int, const int*, mxClassID, mxComplexity)); -//MEX_FN_730(mxArray*, mxCreateCharArray, mxCreateCharArray_730, (size_t, const size_t*)); -//MEX_FN_700(mxArray*, mxCreateCharArray, mxCreateCharArray_700, (int, const int*)); -//MEX_FN_730(mxArray*, mxCreateDoubleMatrix, mxCreateDoubleMatrix_730, (size_t, size_t, mxComplexity)); -//MEX_FN_700(mxArray*, mxCreateDoubleMatrix, mxCreateDoubleMatrix_700, (int, int, mxComplexity)); -//MEX_FN(mxLogical*, mxGetLogicals, (const mxArray*)); -//MEX_FN_730(mxArray*, mxCreateLogicalArray, mxCreateLogicalArray_730, (size_t, const size_t*)); -//MEX_FN_700(mxArray*, mxCreateLogicalArray, mxCreateLogicalArray_700, (int, const int*)); -//MEX_FN_730(mxArray*, mxCreateLogicalMatrix, mxCreateLogicalMatrix_730, (size_t, size_t)); -//MEX_FN_700(mxArray*, mxCreateLogicalMatrix, mxCreateLogicalMatrix_700, (int, int)); -//MEX_FN(mxArray*, mxCreateLogicalScalar, (bool)); -//MEX_FN(bool, mxIsLogicalScalar, (const mxArray*)); -//MEX_FN(bool, mxIsLogicalScalarTrue, (const mxArray*)); -//MEX_FN(mxArray*, mxCreateDoubleScalar, (double)); -//MEX_FN_730(mxArray*, mxCreateSparse, mxCreateSparse_730, (size_t, size_t, size_t, mxComplexity)); -//MEX_FN_700(mxArray*, mxCreateSparse, mxCreateSparse_700, (int, int, int, mxComplexity)); -//MEX_FN_730(mxArray*, mxCreateSparseLogicalMatrix, mxCreateSparseLogicalMatrix_730, (size_t, size_t, size_t)); -//MEX_FN_700(mxArray*, mxCreateSparseLogicalMatrix, mxCreateSparseLogicalMatrix_700, (int, int, int)); -//MEX_FN_730(void, mxGetNChars, mxGetNChars_730, (const mxArray*, char*, size_t)); -//MEX_FN_700(void, mxGetNChars, mxGetNChars_700, (const mxArray*, char*, int)); -//MEX_FN_730(int, mxGetString, mxGetString_730, (const mxArray*, char*, size_t)); -//MEX_FN_700(int, mxGetString, mxGetString_700, (const mxArray*, char*, int)); -//MEX_FN(char*, mxArrayToString, (const mxArray*)); -//MEX_FN_730(mxArray*, mxCreateStringFromNChars, mxCreateStringFromNChars_730, (const char*, size_t)); -//MEX_FN_700(mxArray*, mxCreateStringFromNChars, mxCreateStringFromNChars_700, (const char*, int)); -//MEX_FN(mxArray*, mxCreateString, (const char*)); -//MEX_FN_730(mxArray*, mxCreateCharMatrixFromStrings, mxCreateCharMatrixFromStrings_730, (size_t, const char**)); -//MEX_FN_700(mxArray*, mxCreateCharMatrixFromStrings, mxCreateCharMatrixFromStrings_700, (int, const char**)); -//MEX_FN_730(mxArray*, mxCreateCellMatrix, mxCreateCellMatrix_730, (size_t, size_t)); -//MEX_FN_700(mxArray*, mxCreateCellMatrix, mxCreateCellMatrix_700, (int, int)); -//MEX_FN_730(mxArray*, mxCreateCellArray, mxCreateCellArray_730, (size_t, const size_t*)); -//MEX_FN_700(mxArray*, mxCreateCellArray, mxCreateCellArray_700, (int, const int*)); -//MEX_FN_730(mxArray*, mxCreateStructMatrix, mxCreateStructMatrix_730, (size_t, size_t, int, const char**)); -//MEX_FN_700(mxArray*, mxCreateStructMatrix, mxCreateStructMatrix_700, (int, int, int, const char**)); -//MEX_FN_730(mxArray*, mxCreateStructArray, mxCreateStructArray_730, (size_t, const size_t*, int, const char**)); -//MEX_FN_700(mxArray*, mxCreateStructArray, mxCreateStructArray_700, (int, const int*, int, const char**)); -//MEX_FN(mxArray*, mxDuplicateArray, (const mxArray*)); -//MEX_FN(int, mxSetClassName, (mxArray*, const char*)); -//MEX_FN(int, mxAddField, (mxArray*, const char*)); -//MEX_FN(void, mxRemoveField, (mxArray*, int)); -//MEX_FN(double, mxGetEps, (void)); -//MEX_FN(double, mxGetInf, (void)); -//MEX_FN(double, mxGetNaN, (void)); -//MEX_FN(bool, mxIsFinite, (double)); -//MEX_FN(bool, mxIsInf, (double)); -//MEX_FN(bool, mxIsNaN, (double)); +// MEX_FN_730(void, mxSetN, mxSetN_730, (mxArray*, size_t)); +// MEX_FN_700(void, mxSetN, mxSetN_700, (mxArray*, int)); +// MEX_FN_730(int, mxSetDimensions, mxSetDimensions_730, (mxArray*, const size_t*, size_t)); +// MEX_FN_700(int, mxSetDimensions, mxSetDimensions_700, (mxArray*, const int*, int)); +// MEX_FN(void, mxDestroyArray, (mxArray*)); +// MEX_FN_730(mxArray*, mxCreateNumericArray, mxCreateNumericArray_730, (size_t, const size_t*, mxClassID, mxComplexity)); +// MEX_FN_700(mxArray*, mxCreateNumericArray, mxCreateNumericArray_700, (int, const int*, mxClassID, mxComplexity)); +// MEX_FN_730(mxArray*, mxCreateCharArray, mxCreateCharArray_730, (size_t, const size_t*)); +// MEX_FN_700(mxArray*, mxCreateCharArray, mxCreateCharArray_700, (int, const int*)); +// MEX_FN_730(mxArray*, mxCreateDoubleMatrix, mxCreateDoubleMatrix_730, (size_t, size_t, mxComplexity)); +// MEX_FN_700(mxArray*, mxCreateDoubleMatrix, mxCreateDoubleMatrix_700, (int, int, mxComplexity)); +// MEX_FN(mxLogical*, mxGetLogicals, (const mxArray*)); +// MEX_FN_730(mxArray*, mxCreateLogicalArray, mxCreateLogicalArray_730, (size_t, const size_t*)); +// MEX_FN_700(mxArray*, mxCreateLogicalArray, mxCreateLogicalArray_700, (int, const int*)); +// MEX_FN_730(mxArray*, mxCreateLogicalMatrix, mxCreateLogicalMatrix_730, (size_t, size_t)); +// MEX_FN_700(mxArray*, mxCreateLogicalMatrix, mxCreateLogicalMatrix_700, (int, int)); +// MEX_FN(mxArray*, mxCreateLogicalScalar, (bool)); +// MEX_FN(bool, mxIsLogicalScalar, (const mxArray*)); +// MEX_FN(bool, mxIsLogicalScalarTrue, (const mxArray*)); +// MEX_FN(mxArray*, mxCreateDoubleScalar, (double)); +// MEX_FN_730(mxArray*, mxCreateSparse, mxCreateSparse_730, (size_t, size_t, size_t, mxComplexity)); +// MEX_FN_700(mxArray*, mxCreateSparse, mxCreateSparse_700, (int, int, int, mxComplexity)); +// MEX_FN_730(mxArray*, mxCreateSparseLogicalMatrix, mxCreateSparseLogicalMatrix_730, (size_t, size_t, size_t)); +// MEX_FN_700(mxArray*, mxCreateSparseLogicalMatrix, mxCreateSparseLogicalMatrix_700, (int, int, int)); +// MEX_FN_730(void, mxGetNChars, mxGetNChars_730, (const mxArray*, char*, size_t)); +// MEX_FN_700(void, mxGetNChars, mxGetNChars_700, (const mxArray*, char*, int)); +// MEX_FN_730(int, mxGetString, mxGetString_730, (const mxArray*, char*, size_t)); +// MEX_FN_700(int, mxGetString, mxGetString_700, (const mxArray*, char*, int)); +// MEX_FN(char*, mxArrayToString, (const mxArray*)); +// MEX_FN_730(mxArray*, mxCreateStringFromNChars, mxCreateStringFromNChars_730, (const char*, size_t)); +// MEX_FN_700(mxArray*, mxCreateStringFromNChars, mxCreateStringFromNChars_700, (const char*, int)); +// MEX_FN(mxArray*, mxCreateString, (const char*)); +// MEX_FN_730(mxArray*, mxCreateCharMatrixFromStrings, mxCreateCharMatrixFromStrings_730, (size_t, const char**)); +// MEX_FN_700(mxArray*, mxCreateCharMatrixFromStrings, mxCreateCharMatrixFromStrings_700, (int, const char**)); +// MEX_FN_730(mxArray*, mxCreateCellMatrix, mxCreateCellMatrix_730, (size_t, size_t)); +// MEX_FN_700(mxArray*, mxCreateCellMatrix, mxCreateCellMatrix_700, (int, int)); +// MEX_FN_730(mxArray*, mxCreateCellArray, mxCreateCellArray_730, (size_t, const size_t*)); +// MEX_FN_700(mxArray*, mxCreateCellArray, mxCreateCellArray_700, (int, const int*)); +// MEX_FN_730(mxArray*, mxCreateStructMatrix, mxCreateStructMatrix_730, (size_t, size_t, int, const char**)); +// MEX_FN_700(mxArray*, mxCreateStructMatrix, mxCreateStructMatrix_700, (int, int, int, const char**)); +// MEX_FN_730(mxArray*, mxCreateStructArray, mxCreateStructArray_730, (size_t, const size_t*, int, const char**)); +// MEX_FN_700(mxArray*, mxCreateStructArray, mxCreateStructArray_700, (int, const int*, int, const char**)); +// MEX_FN(mxArray*, mxDuplicateArray, (const mxArray*)); +// MEX_FN(int, mxSetClassName, (mxArray*, const char*)); +// MEX_FN(int, mxAddField, (mxArray*, const char*)); +// MEX_FN(void, mxRemoveField, (mxArray*, int)); +// MEX_FN(double, mxGetEps, (void)); +// MEX_FN(double, mxGetInf, (void)); +// MEX_FN(double, mxGetNaN, (void)); +// MEX_FN(bool, mxIsFinite, (double)); +// MEX_FN(bool, mxIsInf, (double)); +// MEX_FN(bool, mxIsNaN, (double)); #ifdef MEX_FN #undef MEX_FN diff --git a/src/runtime/mini_d3d12.h b/src/runtime/mini_d3d12.h index d003b3514690..e829b997bbc3 100644 --- a/src/runtime/mini_d3d12.h +++ b/src/runtime/mini_d3d12.h @@ -715,8 +715,7 @@ _Post_equal_to_(pp) _Post_satisfies_(return == pp) void **IID_PPV_ARGS_Helper(T #define DECLARE_INTERFACE(iface) \ typedef interface iface { \ const struct iface##Vtbl FAR *lpVtbl; \ - } \ - iface; \ + } iface; \ typedef const struct iface##Vtbl iface##Vtbl; \ const struct iface##Vtbl #else @@ -725,8 +724,7 @@ _Post_equal_to_(pp) _Post_satisfies_(return == pp) void **IID_PPV_ARGS_Helper(T #define DECLARE_INTERFACE(iface) \ typedef interface iface { \ struct iface##Vtbl FAR *lpVtbl; \ - } \ - iface; \ + } iface; \ typedef struct iface##Vtbl iface##Vtbl; \ struct iface##Vtbl #endif @@ -6755,7 +6753,7 @@ interface IDXGIAdapter1 { #endif /* __IDXGIAdapter1_INTERFACE_DEFINED__ */ // NOTE(marcos): declaring CreateDXGIFactory "1" since it works on UWP as well -//HRESULT WINAPI CreateDXGIFactory1(REFIID riid, _COM_Outptr_ void **ppFactory); +// HRESULT WINAPI CreateDXGIFactory1(REFIID riid, _COM_Outptr_ void **ppFactory); typedef HRESULT(WINAPI *PFN_CREATEDXGIFACORY1)(REFIID riid, _COM_Outptr_ void **ppFactory); DEFINE_GUID(IID_IDXGIObject, 0xaec22fb8, 0x76f3, 0x4639, 0x9b, 0xe0, 0x28, 0xeb, 0x43, 0xa6, 0x7a, 0x2e); diff --git a/src/runtime/mini_hexagon_dma.h b/src/runtime/mini_hexagon_dma.h index 1aad24dbb4ec..55f1dea66974 100644 --- a/src/runtime/mini_hexagon_dma.h +++ b/src/runtime/mini_hexagon_dma.h @@ -134,7 +134,7 @@ typedef struct stDmaWrapper_DmaTransferSetup { void *pTcmDataBuf; /// Virtual address of the DDR Frame buffer . void *pFrameBuf; - //UBWC Format + // UBWC Format uint16 bIsFmtUbwc; /// Should the intermediate buffer be padded. This only apply for 8bit format sucha NV12, NV12-4R uint16 bUse16BitPaddingInL2; diff --git a/test/correctness/atomic_tuples.cpp b/test/correctness/atomic_tuples.cpp index dc55e3920930..63a31a798157 100644 --- a/test/correctness/atomic_tuples.cpp +++ b/test/correctness/atomic_tuples.cpp @@ -213,7 +213,7 @@ int main(int argc, char **argv) { if (out(x, y) != correct) { printf("out(%d, %d) = %d instead of %d\n", x, y, out(x, y), correct); - //return -1; + // return -1; } } } diff --git a/test/correctness/boundary_conditions.cpp b/test/correctness/boundary_conditions.cpp index f80698a22db7..7d41139b3755 100644 --- a/test/correctness/boundary_conditions.cpp +++ b/test/correctness/boundary_conditions.cpp @@ -31,7 +31,7 @@ void schedule_test(Func f, int vector_width, const Target &t) { f.gpu_tile(x, y, xo, yo, xi, yi, 2, 2); } else if (t.has_feature(Target::HVX)) { // TODO: Non-native vector widths hang the compiler here. - //f.hexagon(); + // f.hexagon(); } } diff --git a/test/correctness/bounds_inference_chunk.cpp b/test/correctness/bounds_inference_chunk.cpp index 74345b72b56b..63d4e8b12751 100644 --- a/test/correctness/bounds_inference_chunk.cpp +++ b/test/correctness/bounds_inference_chunk.cpp @@ -15,7 +15,7 @@ int main(int argc, char **argv) { h.compute_root(); g.compute_at(f, y); - //f.trace(); + // f.trace(); Buffer out = f.realize({32, 32}); diff --git a/test/correctness/constraints.cpp b/test/correctness/constraints.cpp index a08ba3a6b34b..6899c007d606 100644 --- a/test/correctness/constraints.cpp +++ b/test/correctness/constraints.cpp @@ -8,7 +8,7 @@ using namespace Halide; bool error_occurred = false; void my_error_handler(JITUserContext *user_context, const char *msg) { - //printf("%s\n", msg); + // printf("%s\n", msg); error_occurred = true; } diff --git a/test/correctness/convolution.cpp b/test/correctness/convolution.cpp index 5721f3191a83..5e70a58abe9d 100644 --- a/test/correctness/convolution.cpp +++ b/test/correctness/convolution.cpp @@ -5,7 +5,7 @@ using namespace Halide; int main(int argc, char **argv) { - //int W = 64*3, H = 64*3; + // int W = 64*3, H = 64*3; const int W = 128, H = 48; Buffer in(W, H); diff --git a/test/correctness/convolution_multiple_kernels.cpp b/test/correctness/convolution_multiple_kernels.cpp index c494cc99bdd8..0b761d314a71 100644 --- a/test/correctness/convolution_multiple_kernels.cpp +++ b/test/correctness/convolution_multiple_kernels.cpp @@ -5,7 +5,7 @@ using namespace Halide; int main(int argc, char **argv) { - //int W = 64*3, H = 64*3; + // int W = 64*3, H = 64*3; const int W = 64, H = 16; Buffer in(W, H); diff --git a/test/correctness/extern_stage.cpp b/test/correctness/extern_stage.cpp index 8000588f5a69..51440e26a987 100644 --- a/test/correctness/extern_stage.cpp +++ b/test/correctness/extern_stage.cpp @@ -31,7 +31,7 @@ extern "C" DLLEXPORT int flip_x(halide_buffer_t *in1, halide_buffer_t *in2, hali // We don't mutate the output buffer, because we can handle // any size output. - //printf("Bounds inference flip_x over [%d %d] requires [%d %d]\n", min, extent, flipped_min, extent); + // printf("Bounds inference flip_x over [%d %d] requires [%d %d]\n", min, extent, flipped_min, extent); } else { assert(in1->type == halide_type_of()); assert(in2->type == halide_type_of()); diff --git a/test/correctness/gpu_allocation_cache.cpp b/test/correctness/gpu_allocation_cache.cpp index a0f104b83f7a..97215b95aea5 100644 --- a/test/correctness/gpu_allocation_cache.cpp +++ b/test/correctness/gpu_allocation_cache.cpp @@ -125,10 +125,10 @@ int main(int argc, char **argv) { }; // First run them serially (compilation of a Func isn't thread-safe). - //test1(true); - //test2(true); - //test3(true); - //return 0; + // test1(true); + // test2(true); + // test3(true); + // return 0; // Now run all at the same time to check for concurrency issues. diff --git a/test/correctness/gpu_mixed_dimensionality.cpp b/test/correctness/gpu_mixed_dimensionality.cpp index d2644e14bc63..aabd118271ec 100644 --- a/test/correctness/gpu_mixed_dimensionality.cpp +++ b/test/correctness/gpu_mixed_dimensionality.cpp @@ -28,8 +28,8 @@ int main(int argc, char **argv) { h.compute_at(out, x).gpu_threads(x, y); h.update().gpu_threads(x); // TODO: NormalizeDimensionality in FuseGPUThreadLoops.cpp doesn't work in the following case. - //g.compute_at(h, y).gpu_threads(x); - //g.update(); + // g.compute_at(h, y).gpu_threads(x); + // g.update(); g.compute_at(h, x); g.update(); f.compute_at(g, x); diff --git a/test/correctness/image_of_lists.cpp b/test/correctness/image_of_lists.cpp index 474770e55900..b2b428091d12 100644 --- a/test/correctness/image_of_lists.cpp +++ b/test/correctness/image_of_lists.cpp @@ -50,16 +50,16 @@ int main(int argc, char **argv) { // Inspect the results for correctness for (int i = 0; i < 100; i++) { std::list *list = result(i); - //printf("Factors of %d: ", i); + // printf("Factors of %d: ", i); for (std::list::iterator iter = list->begin(); iter != list->end(); iter++) { int factor = *iter; if (i % factor) { printf("Error: %d is not a factor of %d\n", factor, i); return -1; } - //printf("%d ", factor); + // printf("%d ", factor); } - //printf("\n"); + // printf("\n"); delete list; } diff --git a/test/correctness/inverse.cpp b/test/correctness/inverse.cpp index c86a4803397a..3e4a80a4afb1 100644 --- a/test/correctness/inverse.cpp +++ b/test/correctness/inverse.cpp @@ -24,7 +24,7 @@ void check(Buffer a, Buffer b) { int err = bits_diff(a(i), b(i)); if (err > 13) { printf("Mismatch in mantissa at %d: %10.10f %10.10f. Differs by %d bits.\n", i, a(i), b(i), err); - //exit(-1); + // exit(-1); } } } diff --git a/test/correctness/issue_3926.cpp b/test/correctness/issue_3926.cpp index 140af87e6e35..30d7cd0b1713 100644 --- a/test/correctness/issue_3926.cpp +++ b/test/correctness/issue_3926.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) { f(x) = x; g(x, y) = f(x) + select(param, 1, 2); - //g.gpu_tile(x, y, tx, ty, 8, 8, TailStrategy::GuardWithIf); + // g.gpu_tile(x, y, tx, ty, 8, 8, TailStrategy::GuardWithIf); g.specialize(param).tile(x, y, tx, ty, 8, 8, TailStrategy::GuardWithIf); g.specialize(!param).tile(x, y, tx, ty, 8, 8, TailStrategy::GuardWithIf); g.specialize_fail("Unknown"); diff --git a/test/correctness/simd_op_check_hvx.cpp b/test/correctness/simd_op_check_hvx.cpp index 8b1b42e94eda..d848d1773b37 100644 --- a/test/correctness/simd_op_check_hvx.cpp +++ b/test/correctness/simd_op_check_hvx.cpp @@ -693,9 +693,9 @@ class SimdOpCheckHVX : public SimdOpCheckTest { check("v*:*.h += vtmpy(v*:*.ub, r*.b)", hvx_width, sum(i16(in_u8(x + r3)))); check("v*:*.w += vtmpy(v*:*.h, r*.b)", hvx_width, sum(i32(in_i16(x + r3)))); // TODO: This should work, a common stencil - //check("v*:*.h += vtmpy(v*:*.b, r*.b)", hvx_width, sum(i16(in_i8(x + r3)) * mux(r3, {1, 2, 1}))); - //check("v*:*.h += vtmpy(v*:*.ub, r*.b)", hvx_width, sum(i16(in_u8(x + r3)) * mux(r3, {1, 2, 1}))); - //check("v*:*.w += vtmpy(v*:*.h, r*.b)", hvx_width, sum(i32(in_i16(x + r3)) * mux(r3, {1, 2, 1}))); + // check("v*:*.h += vtmpy(v*:*.b, r*.b)", hvx_width, sum(i16(in_i8(x + r3)) * mux(r3, {1, 2, 1}))); + // check("v*:*.h += vtmpy(v*:*.ub, r*.b)", hvx_width, sum(i16(in_u8(x + r3)) * mux(r3, {1, 2, 1}))); + // check("v*:*.w += vtmpy(v*:*.h, r*.b)", hvx_width, sum(i32(in_i16(x + r3)) * mux(r3, {1, 2, 1}))); } private: diff --git a/test/correctness/strided_load.cpp b/test/correctness/strided_load.cpp index 4de5f17168cb..ab3d2a5dd329 100644 --- a/test/correctness/strided_load.cpp +++ b/test/correctness/strided_load.cpp @@ -23,7 +23,7 @@ int main(int argc, char **argv) { g(x) = f(2 * x); g.compute_root().vectorize(x, 16).bound(x, 0, 425); // 24 * 2 = 48 < 49 - //g.compile_to_assembly("/dev/stdout", std::vector(), "g"); + // g.compile_to_assembly("/dev/stdout", std::vector(), "g"); g.realize({425}); diff --git a/test/correctness/tiled_matmul.cpp b/test/correctness/tiled_matmul.cpp index 8c703b3faa3b..0d3c924fc384 100644 --- a/test/correctness/tiled_matmul.cpp +++ b/test/correctness/tiled_matmul.cpp @@ -190,8 +190,8 @@ bool matmul_bf16() { Buffer out(col, row); // Uncomment to check the asm - //result.compile_to_llvm_assembly(Internal::get_test_tmp_dir() + "tiled_matmul_bf16.ll", {A, B}, target); - //result.compile_to_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.s", {A, B}, target); + // result.compile_to_llvm_assembly(Internal::get_test_tmp_dir() + "tiled_matmul_bf16.ll", {A, B}, target); + // result.compile_to_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.s", {A, B}, target); result.realize(out); diff --git a/test/correctness/vector_cast.cpp b/test/correctness/vector_cast.cpp index b15819ac9a50..894159916c01 100644 --- a/test/correctness/vector_cast.cpp +++ b/test/correctness/vector_cast.cpp @@ -62,7 +62,7 @@ bool test(int vec_width, const Target &target) { } else { if (target.has_feature(Target::HVX)) { // TODO: Non-native vector widths hang the compiler here. - //f.hexagon(); + // f.hexagon(); } if (vec_width > 1) { f.vectorize(x, vec_width); diff --git a/test/error/missing_args.cpp b/test/error/missing_args.cpp index fbddb04b7e45..5669cbf8217a 100644 --- a/test/error/missing_args.cpp +++ b/test/error/missing_args.cpp @@ -12,8 +12,8 @@ int main(int argc, char **argv) { f(x) = im(x, x) + arg; std::vector args; - //args.push_back(im); - //args.push_back(arg); + // args.push_back(im); + // args.push_back(arg); f.compile_to_object("f.o", args, "f"); printf("Success!\n"); diff --git a/test/generator/error_codes_aottest.cpp b/test/generator/error_codes_aottest.cpp index 4368ceb99423..4e62f23f87c0 100644 --- a/test/generator/error_codes_aottest.cpp +++ b/test/generator/error_codes_aottest.cpp @@ -7,7 +7,7 @@ void my_halide_error(void *user_context, const char *msg) { // Silently drop the error - //printf("%s\n", msg); + // printf("%s\n", msg); } void check(int result, int correct) { diff --git a/test/generator/float16_t_aottest.cpp b/test/generator/float16_t_aottest.cpp index e03ce1cdf7a2..34369bb15b0d 100644 --- a/test/generator/float16_t_aottest.cpp +++ b/test/generator/float16_t_aottest.cpp @@ -64,7 +64,7 @@ int main() { (1.0f) / (1 << 23), // 0x1.000000p-23 (-1.0f) / (1 << 23), // -0x1.000000p-23 (1.5f) / (1 << 23), // 0x1.800000p-23 - float_from_bits(0x387fc000), //0x1.ff8000p-15, + float_from_bits(0x387fc000), // 0x1.ff8000p-15, float_from_bits(0x387f8000), // 0x1.ff0000p-15, 1.0f, -1.0f}; diff --git a/test/performance/nested_vectorization_gemm.cpp b/test/performance/nested_vectorization_gemm.cpp index 25a0bc746fb1..832c884569f4 100644 --- a/test/performance/nested_vectorization_gemm.cpp +++ b/test/performance/nested_vectorization_gemm.cpp @@ -286,7 +286,7 @@ int main(int argc, char **argv) { Buffer out(f_buf.width() - g_buf.width() - 128); // Uncomment to check the asm - //result.compile_to_assembly("/dev/stdout", {f, g}, target); + // result.compile_to_assembly("/dev/stdout", {f, g}, target); times[use_nested_vectorization] = Tools::benchmark(10, 10, [&]() { diff --git a/test/performance/tiled_matmul.cpp b/test/performance/tiled_matmul.cpp index 2fd90683bd38..03bd243ef554 100644 --- a/test/performance/tiled_matmul.cpp +++ b/test/performance/tiled_matmul.cpp @@ -140,8 +140,8 @@ bool matmul(Halide::Target target) { Func result = mm.in(); // Uncomment to check the asm - //result.compile_to_llvm_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.ll", {A, B}, target); - //result.compile_to_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.s", {A, B}, target); + // result.compile_to_llvm_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.ll", {A, B}, target); + // result.compile_to_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.s", {A, B}, target); auto time = Tools::benchmark(20, 20, [&]() { result.realize(out); @@ -222,8 +222,8 @@ bool matmul_bf16(Halide::Target target) { Buffer out(col, row); // Uncomment to check the asm - //result.compile_to_llvm_assembly(Internal::get_test_tmp_dir() + "tiled_matmul_bf16.ll", {A, B}, target); - //result.compile_to_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.s", {A, B}, target); + // result.compile_to_llvm_assembly(Internal::get_test_tmp_dir() + "tiled_matmul_bf16.ll", {A, B}, target); + // result.compile_to_assembly(Internal::get_test_tmp_dir() + "tiled_matmul.s", {A, B}, target); auto time = Tools::benchmark(20, 20, [&]() { result.realize(out); diff --git a/util/HalideTraceUtils.cpp b/util/HalideTraceUtils.cpp index 6311ff6c2734..7efc3c9ebaef 100644 --- a/util/HalideTraceUtils.cpp +++ b/util/HalideTraceUtils.cpp @@ -40,7 +40,7 @@ bool Packet::read(void *d, size_t size, FILE *fdesc) { perror("Failed during read"); exit(-1); } - return false; //EOF + return false; // EOF } return true;