Commit 7a2b701

committed

Merge with Conflict Markers

CONFLICT (content): Merge conflict in clang/lib/Basic/Targets/NVPTX.cpp CONFLICT (content): Merge conflict in libclc/clc/lib/generic/math/clc_sw_fma.cl CONFLICT (modify/delete): libclc/libspirv/lib/generic/math/clc_hypot.cl deleted in HEAD and modified in d465594. Version d465594 of libclc/libspirv/lib/generic/math/clc_hypot.cl left in tree. CONFLICT (content): Merge conflict in libclc/libspirv/lib/generic/math/frexp.inc CONFLICT (content): Merge conflict in libclc/libspirv/lib/generic/math/nan.cl CONFLICT (content): Merge conflict in libclc/libspirv/lib/generic/math/sincos_helpers.cl CONFLICT (modify/delete): sycl-jit/jit-compiler/lib/translation/KernelTranslation.cpp deleted in HEAD and modified in d465594. Version d465594 of sycl-jit/jit-compiler/lib/translation/KernelTranslation.cpp left in tree. CONFLICT (modify/delete): sycl-jit/passes/target/TargetFusionInfo.cpp deleted in HEAD and modified in d465594. Version d465594 of sycl-jit/passes/target/TargetFusionInfo.cpp left in tree.

2 parents c17f4ef + d465594 commit 7a2b701Copy full SHA for 7a2b701

8,035 files changed

+482483

-328018

lines changed

.ci
.github
- new-prs-labeler.yml
- workflows
  - build-ci-container.yml
  - commit-access-greeter.yml
  - commit-access-review.yml
  - containers
    - github-action-ci-windows
      - Dockerfile
    - github-action-ci
      - Dockerfile
  - docs.yml
  - issue-write.yml
  - libclang-abi-tests.yml
  - libcxx-build-and-test.yaml
  - llvm-tests.yml
  - pr-code-format.yml
  - premerge.yaml
  - release-asset-audit.yml
  - release-binaries-all.yml
  - release-binaries.yml
  - scorecard.yml
bolt
- include/bolt
- lib
  - Core
  - Passes
  - Rewrite
    - MachORewriteInstance.cpp
    - RewriteInstance.cpp
  - Target
    - AArch64
      - AArch64MCPlusBuilder.cpp
      - AArch64MCSymbolizer.cpp
    - RISCV
      - RISCVMCPlusBuilder.cpp
    - X86
      - X86MCPlusBuilder.cpp
  - Utils
    - CommandLineOpts.cpp
- test
  - AArch64
  - Inputs
    - indirect_goto.c
  - X86
  - binary-analysis/AArch64
  - indirect-goto-relocs.test
- unittests/Core
clang-tools-extra
- clang-doc
  - HTMLGenerator.cpp
  - MDGenerator.cpp
  - Representation.cpp
  - Representation.h
  - assets
    - index.js
  - tool
    - ClangDocMain.cpp
- clang-move
  - Move.cpp
- clang-query
  - Query.cpp
- clang-tidy
- clangd
  - AST.cpp
  - ClangdServer.cpp
  - CodeComplete.cpp
  - CodeComplete.h
  - Config.h
  - ConfigCompile.cpp
  - ConfigFragment.h
  - ConfigYAML.cpp
  - DumpAST.cpp
  - FindTarget.cpp
  - HeaderSourceSwitch.cpp
  - Headers.cpp
  - ModulesBuilder.cpp
  - Preamble.cpp
  - index/dex
    - Dex.cpp
    - dexp
      - Dexp.cpp
  - refactor
    - Rename.cpp
    - Rename.h
    - tweaks
      - ExtractVariable.cpp
  - tool
    - ClangdMain.cpp
  - unittests
- docs
  - ReleaseNotes.rst
  - clang-tidy/checks
- include-cleaner/lib
  - WalkAST.cpp
- modularize
- test
  - clang-doc
    - DR-131697.cpp
    - Inputs/basic-project/src
    - assets.cpp
    - basic-project.test
    - enum.cpp
    - namespace.cpp
    - single-file-public.cpp
    - single-file.cpp
    - templates.cpp
    - test-path-abs.cpp
  - clang-tidy
    - check_clang_tidy.py
    - checkers
      - bugprone
        capturing-this-in-member-variable.cpp
      - misc
        const-correctness-values.cpp
        use-internal-linkage-var.cpp
      - modernize
        use-starts-ends-with.cpp
      - readability
        identifier-naming-anon-record-fields.cpp
    - infrastructure
      - file-filter.cpp
      - header-filter-from-config-file
        inheritance
        .clang-tidy
        foo.cpp
        foo.h
        subfolder
        .clang-tidy
        bar.cpp
        bar.h
        simple
        .clang-tidy
        foo.cpp
        foo.h
      - system-headers.cpp
- unittests/clang-doc
  - HTMLGeneratorTest.cpp
clang
compiler-rt
- CMakeLists.txt
- cmake
  - Modules
    - AddCompilerRT.cmake
    - CompilerRTUtils.cmake
  - builtin-config-ix.cmake
- include/profile
  - InstrProfData.inc
- lib
  - asan
  - builtins
    - CMakeLists.txt
    - cpu_model
      - AArch64CPUFeatures.inc
      - aarch64
        fmv
        mrs.inc
        hwcap.inc
  - ctx_profile
  - interception
    - interception_win.cpp
    - tests
      - interception_win_test.cpp
  - memprof
    - memprof_flags.h
  - msan/tests
    - msan_test.cpp
  - orc
  - profile
  - rtsan
    - rtsan_interceptors_posix.cpp
    - tests
      - rtsan_test_interceptors_posix.cpp
  - sanitizer_common
  - scudo/standalone
    - secondary.h
  - tsan/rtl
    - tsan_interceptors_posix.cpp
- test
  - CMakeLists.txt
  - asan
    - TestCases
    - lit.cfg.py
  - ctx_profile/TestCases
    - generate-context.cpp
  - lit.common.cfg.py
  - lit.common.configured.in
  - metadata
    - lit.cfg.py
  - profile
  - sanitizer_common
    - TestCases
      - Darwin
        malloc_zone.cpp
      - Linux
        getservent_r.cpp
        preadv2.cpp
      - disable_symbolizer_path_search.cpp
    - lit.common.cfg.py
  - tsan
    - Darwin
      - no_call_setenv_in_symbolize.cpp
    - Linux
      - clone_setns.cpp
    - cxa_guard_acquire.cpp
cross-project-tests
- debuginfo-tests
  - dexter-tests
  - dexter/feature_tests
    - commands
      - penalty
        dex_declare_file.cpp
        expect_program_state.cpp
        expect_step_kinds.cpp
        expect_step_order.cpp
        expect_watch_type.cpp
        expect_watch_value.cpp
        float_range_out_range.cpp
        float_range_zero_nonmatch.cpp
        missing_dex_address.cpp
        unreachable.cpp
        unreachable_line_range.cpp
        unreachable_on_line.cpp
      - perfect
        command_line.c
        dex_declare_address
        address_after_ref.cpp
        address_hit_count.cpp
        expression_address.cpp
        identical_address.cpp
        multiple_address.cpp
        offset_address.cpp
        self_comparison.cpp
        dex_declare_file
        dex_and_source
        test.cpp
        precompiled_binary
        commands.dex
        windows_noncanonical_path
        test.dex
        dex_finish_test
        default_conditional.cpp
        default_conditional_hit_count.cpp
        default_hit_count.cpp
        default_simple.cpp
        limit_steps_conditional.cpp
        limit_steps_conditional_hit_count.cpp
        limit_steps_hit_count.cpp
        limit_steps_simple.cpp
        expect_program_state.cpp
        expect_step_kind
        direction.cpp
        func.cpp
        func_external.cpp
        recursive.cpp
        small_loop.cpp
        expect_step_order.cpp
        expect_watch_type.cpp
        expect_watch_value.cpp
        float_range_watch
        float_range_multiple.cpp
        float_range_no_arg.cpp
        float_range_small.cpp
        float_range_zero_match.cpp
        limit_steps
        hit_count.cpp
        limit_steps_check_json_step_count.cpp
        limit_steps_expect_loop.cpp
        limit_steps_expect_value.cpp
        limit_steps_line_mismatch.cpp
        limit_steps_overlapping_ranges.cpp
        limit_steps_same_line_conditional.cpp
        unconditional.cpp
        unreachable.cpp
        unreachable_not_cmd_lineno.cpp
        unreachable_on_line.cpp
    - subtools
      - test
        address_printing.cpp
        err_bad_label_ref.cpp
        err_duplicate_address.cpp
        err_duplicate_label.cpp
        err_paren.cpp
        err_paren_mline.cpp
        err_syntax.cpp
        err_syntax_dexdeclarefile.cpp
        err_syntax_mline.cpp
        err_type.cpp
        err_type_mline.cpp
        err_undeclared_addr.cpp
        label_another_line.cpp
        label_offset.cpp
        source-root-dir.cpp
        target_run_args.c
        target_run_args_with_command.c
      - view.cpp
  - llgdb-tests
    - llgdb.py
    - test_debuginfo.pl
- lit.cfg.py
- tools/llvm-objdump/ARM
  - lit.local.cfg
  - plt.c
flang-rt
- CMakeLists.txt
- README.md
- cmake
- include/flang-rt/runtime
  - environment.h
- lib
- unittests/Runtime
flang
libclc
- CMakeLists.txt
- amdgcn/lib
  - cl_khr_int64_extended_atomics
    - minmax_helpers.ll
  - math
    - fmax.cl
    - fmin.cl
  - mem_fence
    - fence.cl
  - synchronization
    - barrier.cl
- amdgpu/lib
- clc
  - include/clc
  - lib
- clspv/lib
  - SOURCES
  - math
    - fma.cl
  - shared
    - vstore_half.cl
    - vstore_half.inc
  - subnormal_config.cl
- cmake/modules
  - AddLibclc.cmake
- generic
  - include
    - as_type.h
    - clc
      - async
        async_work_group_copy.h
        async_work_group_copy.inc
        async_work_group_strided_copy.h
        async_work_group_strided_copy.inc
        prefetch.h
        prefetch.inc
        wait_group_events.h
      - atom_decl_int32.inc
      - atom_decl_int64.inc
      - atomic
        atomic_add.h
        atomic_and.h
        atomic_cmpxchg.h
        atomic_dec.h
        atomic_decl.inc
        atomic_inc.h
        atomic_max.h
        atomic_min.h
        atomic_or.h
        atomic_sub.h
        atomic_xchg.h
        atomic_xor.h
      - cl_khr_global_int32_base_atomics
        atom_add.h
        atom_cmpxchg.h
        atom_dec.h
        atom_inc.h
        atom_sub.h
        atom_xchg.h
      - cl_khr_global_int32_extended_atomics
        atom_and.h
        atom_max.h
        atom_min.h
        atom_or.h
        atom_xor.h
      - cl_khr_int64_base_atomics
        atom_add.h
        atom_cmpxchg.h
        atom_dec.h
        atom_inc.h
        atom_sub.h
        atom_xchg.h
      - cl_khr_int64_extended_atomics
        atom_and.h
        atom_max.h
        atom_min.h
        atom_or.h
        atom_xor.h
      - cl_khr_local_int32_base_atomics
        atom_add.h
        atom_cmpxchg.h
        atom_dec.h
        atom_inc.h
        atom_sub.h
        atom_xchg.h
      - cl_khr_local_int32_extended_atomics
        atom_and.h
        atom_max.h
        atom_min.h
        atom_or.h
        atom_xor.h
      - clc.h
      - common
        degrees.h
        degrees.inc
        mix.h
        mix.inc
        radians.h
        radians.inc
        sign.h
        smoothstep.h
        smoothstep.inc
        step.h
        step.inc
      - convert.h
      - explicit_fence
        explicit_memory_fence.h
      - geometric
        cross.h
        distance.h
        distance.inc
        dot.h
        dot.inc
        fast_distance.h
        fast_distance.inc
        fast_length.h
        fast_length.inc
        fast_normalize.h
        fast_normalize.inc
        length.h
        length.inc
        normalize.h
        normalize.inc
      - image
        image.h
        image_defines.h
      - integer
        abs.h
        abs.inc
        abs_diff.h
        abs_diff.inc
        add_sat.h
        add_sat.inc
        clz.h
        hadd.h
        integer-gentype.inc
        mad24.h
        mad_hi.h
        mad_sat.h
        mad_sat.inc
        mul24.h
        mul_hi.h
        popcount.h
        rhadd.h
        rotate.h
        rotate.inc
        sub_sat.h
        sub_sat.inc
        unary.inc
        upsample.h
      - math
        acos.h
        acosh.h
        acospi.h
        asin.h
        asinh.h
        asinpi.h
        atan.h
        atan2.h
        atan2pi.h
        atanh.h
        atanpi.h
        binary_decl_tt.inc
        cbrt.h
        ceil.h
        copysign.h
        cos.h
        cosh.h
        cospi.h
        erf.h
        erfc.h
        exp.h
        exp10.h
        exp2.h
        expm1.h
        fabs.h
        fdim.h
        floor.h
        fma.h
        fmax.h
        fmin.h
        fmod.h
        fract.h
        fract.inc
        frexp.h
        frexp.inc
        half_cos.h
        half_divide.h
        half_exp.h
        half_exp10.h
        half_exp2.h
        half_log.h
        half_log10.h
        half_log2.h
        half_powr.h
        half_recip.h
        half_rsqrt.h
        half_sin.h
        half_sqrt.h
        half_tan.h
        hypot.h
        ilogb.h
        ilogb.inc
        ldexp.h
        ldexp.inc
        lgamma.h
        lgamma_r.h
        lgamma_r.inc
        log.h
        log10.h
        log1p.h
        log2.h
        logb.h
        mad.h
        maxmag.h
        minmag.h
        modf.h
        nan.h
        nan.inc
        native_cos.h
        native_divide.h
        native_exp.h
        native_exp10.h
        native_exp2.h
        native_log.h
        native_log10.h
        native_log2.h
        native_powr.h
        native_recip.h
        native_rsqrt.h
        native_sin.h
        native_sqrt.h
        native_tan.h
        nextafter.h
        pow.h
        pown.h
        pown.inc
        powr.h
        remainder.h
        remquo.h
        remquo.inc
        rint.h
        rootn.h
        rootn.inc
        round.h
        rsqrt.h
        sin.h
        sincos.h
        sincos.inc
        sinh.h
        sinpi.h
        sqrt.h
        tan.h
        tanh.h
        tanpi.h
        tgamma.h
        trunc.h
      - misc
        shuffle.h
        shuffle2.h
      - relational
        all.h
        any.h
        bitselect.h
        bitselect.inc
        isequal.h
        isfinite.h
        isgreater.h
        isgreaterequal.h
        isinf.h
        isless.h
        islessequal.h
        islessgreater.h
        isnan.h
        isnormal.h
        isnotequal.h
        isordered.h
        isunordered.h
        select.h
        signbit.h
      - shared
        clamp.h
        clamp.inc
        max.h
        max.inc
        min.h
        min.inc
        vload.h
        vstore.h
      - synchronization
        barrier.h
        cl_mem_fence_flags.h
      - workitem
        get_global_id.h
        get_global_offset.h
        get_global_size.h
        get_group_id.h
        get_local_id.h
        get_local_size.h
        get_num_groups.h
        get_work_dim.h
    - core/integer
      - clc_add_sat.inc
    - macros.h
    - math
  - lib
    - SOURCES
    - async
    - atom_int32_binary.inc
    - atomic
    - cl_khr_global_int32_base_atomics
    - cl_khr_global_int32_extended_atomics
    - cl_khr_int64_base_atomics
    - cl_khr_int64_extended_atomics
    - cl_khr_local_int32_base_atomics
libc
- CMakeLists.txt
- Maintainers.rst
- cmake/modules
- config
  - baremetal
    - aarch64
      - entrypoints.txt
    - arm
      - entrypoints.txt
    - riscv
      - entrypoints.txt
  - darwin
    - arm
      - entrypoints.txt
    - x86_64
      - entrypoints.txt
  - gpu
    - amdgpu
      - entrypoints.txt
    - nvptx
      - entrypoints.txt
  - linux
    - aarch64
      - entrypoints.txt
      - headers.txt
    - arm
      - entrypoints.txt
    - riscv
      - entrypoints.txt
    - x86_64
      - entrypoints.txt
  - windows
    - entrypoints.txt
- docs
  - CMakeLists.txt
  - Maintainers.rst
  - headers
    - index.rst
    - math
      - index.rst
  - index.rst
  - uefi
    - index.rst
- hdr
- include
  - CMakeLists.txt
  - llvm-libc-macros/linux
    - sched-macros.h
  - llvm-libc-types
  - math.yaml
  - search.yaml
  - stdlib.yaml
  - sys
    - time.yaml
- shared
  - rpc.h
- src
  - __support
    - CMakeLists.txt
    - CPP
      - atomic.h
      - type_traits
        is_signed.h
        is_unsigned.h
    - FPUtil
    - OSUtil/linux
      - CMakeLists.txt
    - RPC
      - rpc_server.h
    - float_to_string.h
    - libc_assert.h
    - str_to_float.h
    - str_to_integer.h
  - math
  - sched
  - search
  - stdio
    - CMakeLists.txt
    - baremetal
    - generic
    - scanf_core
      - CMakeLists.txt
  - stdlib
  - sys
    - CMakeLists.txt
    - time
      - CMakeLists.txt
      - linux
        CMakeLists.txt
        utimes.cpp
      - utimes.h
  - time
- test
  - UnitTest
  - src
- utils
  - MPFRWrapper
    - MPFRUtils.cpp
  - docgen
    - dirent.yaml
  - gpu
    - CMakeLists.txt
    - loader
      - CMakeLists.txt
      - Loader.h
      - Main.cpp
      - amdgpu
        CMakeLists.txt
        amdhsa-loader.cpp
      - nvptx
        CMakeLists.txt
        nvptx-loader.cpp

8,035 files changed

+482483

-328018

lines changed

`‎.ci/compute-projects.sh`

This file was deleted.

Comments

(0)