Differential D58852

Changes from integrating PSTL with libstdc++
AbandonedPublic
Actions

Authored by rodgert on Mar 1 2019, 4:03 PM.

Details

Reviewers

ldionne

Summary

This is a combination of the following:

Remove unused include - pstl_config.h is not required

Introduce forward declarations - necessary to break circular includes when introduced to the standard library's, e.g. - <algorithm> <numeric> <memory>

Deprecate non-cmake build and test suite Makefile based build is not a LLVM standard Original test suite does not conform to libc++'s standards Scripts for integrating tests into libstdc++ assume libc++'s test layout

Diff Detail

Repository

rPSTL pstl

Build Status

Buildable 28691
Build 28690: arc lint + arc unit

Event Timeline

rodgert created this revision.Mar 1 2019, 4:03 PM

Herald added a reviewer: ldionne. · View Herald TranscriptMar 1 2019, 4:03 PM

Herald added subscribers: libcxx-commits, jdoerfert, mstorsjo and 3 others. · View Herald Transcript

Harbormaster completed remote builds in B28691: Diff 188992.Mar 1 2019, 4:03 PM

Do you think you could split this change into smaller changes? Perhaps one that removes the support for the Makefile tests, one that introduces forward declarations, and one that renames the test suite files?

In D58852#1416945, @ldionne wrote:

Do you think you could split this change into smaller changes? Perhaps one that removes the support for the Makefile tests, one that introduces forward declarations, and one that renames the test suite files?

I tried to git rebase --interactive my way into something along those lines, but the series of commits which were squashed into this one made the process fairly messy. I can certainly split this one into two changes though, one that introduces the forward declarations (it also removes some unused includes), and one that simultaneously deprecates the support for the Makefile tests and reintroduces them with the new structure. Would that work for you?

In D58852#1416971, @rodgert wrote:

I tried to git rebase --interactive my way into something along those lines, but the series of commits which were squashed into this one made the process fairly messy. I can certainly split this one into two changes though, one that introduces the forward declarations (it also removes some unused includes), and one that simultaneously deprecates the support for the Makefile tests and reintroduces them with the new structure. Would that work for you?

Yes.

MikeDvorskiy added a subscriber: MikeDvorskiy.Mar 5 2019, 4:26 AM

MikeDvorskiy added inline comments.

include/pstl/internal/algorithm_fwd.h
2	Thomas, what's a reason to rename the files with forward declarations? (glue_algorithm_defs.h, glue_numeric_defs.h, glue_memory_defs.h to algorithm_fwd.h, numeric_fwd.h, memory_fwd.h)

pstl_config.h is not required

Thomas, could you please clarify it?

The fact is the file contains significant macros, which are used in simd bricks, and the other useful macros.

In D58852#1418265, @MikeDvorskiy wrote:

pstl_config.h is not required

Thomas, could you please clarify it?

The fact is the file contains significant macros, which are used in simd bricks, and the other useful macros.

The fact is, it is already included by another file here, so this include is redundant. Removing the include here is the correct thing to do, also because this config file's contents become part of the standard library's configuration when included in libstdc++ (and almost certainly the same with libc++).

include/pstl/internal/algorithm_fwd.h
2	Look carefully at the files, they are NOT the same thing.

Will resubmit (as discussed) as a couple of smaller patches

Large Diff

This large diff affects 151 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

CMakeLists.txt

5 lines

build/

android.linux.launcher.sh

jni/

include/

pstl/

internal/

algorithm_fwd.h

1219 lines

glue_algorithm_impl.h

4 lines

glue_execution_defs.h

4 lines

glue_memory_impl.h

2 lines

numeric_fwd.h

131 lines

numeric_impl.h

2 lines

test/

CMakeLists.txt

40 lines

pstl_test_config.h

std/

CMakeLists.txt

3 lines

algorithms/

CMakeLists.txt

4 lines

alg.merge/

CMakeLists.txt

10 lines

alg.modifying.operations/

CMakeLists.txt

26 lines

alg.copy/

CMakeLists.txt

7 lines

alg.partitions/

CMakeLists.txt

11 lines

alg.reverse/

CMakeLists.txt

10 lines

alg.nonmodifying/

CMakeLists.txt

22 lines

alg.sorting/

CMakeLists.txt

17 lines

alg.heap.operations/

CMakeLists.txt

9 lines

alg.lex.comparison/

CMakeLists.txt

9 lines

alg.min.max/

CMakeLists.txt

9 lines

alg.set.operations/

CMakeLists.txt

10 lines

numerics/

CMakeLists.txt

1 line

numeric.ops/

CMakeLists.txt

13 lines

utilities/

CMakeLists.txt

1 line

memory/

CMakeLists.txt

1 line

specialized.algorithms/

CMakeLists.txt

11 lines

	std/

	algorithms/

	alg.merge/

	inplace_merge.pass.cpp
	test_inplace_merge.cpp

17 lines

	merge.pass.cpp
	test_merge.cpp

15 lines

	alg.modifying.operations/

	alg.copy/

	copy_if.pass.cpp
	test_copy_if.cpp

19 lines

	alg.partitions/

	is_partitioned.pass.cpp
	test_is_partitioned.cpp

19 lines

	partition.pass.cpp
	test_partition.cpp

25 lines

	partition_copy.pass.cpp
	test_partition_copy.cpp

22 lines

	alg.reverse/

	reverse.pass.cpp
	test_reverse.cpp

19 lines

	reverse_copy.pass.cpp
	test_reverse_copy.cpp

19 lines

	copy_move.pass.cpp
	test_copy_move.cpp

24 lines

	fill.pass.cpp
	test_fill.cpp

13 lines

	generate.pass.cpp
	test_generate.cpp

14 lines

	remove.pass.cpp
	test_remove.cpp

15 lines

	remove_copy.pass.cpp
	test_remove_copy.cpp

16 lines

	replace.pass.cpp
	test_replace.cpp

14 lines

	replace_copy.pass.cpp
	test_replace_copy.cpp

16 lines

	rotate.pass.cpp
	test_rotate.cpp

23 lines

	rotate_copy.pass.cpp
	test_rotate_copy.cpp

19 lines

	swap_ranges.pass.cpp
	test_swap_ranges.cpp

15 lines

	transform_binary.pass.cpp
	test_transform_binary.cpp

15 lines

	transform_unary.pass.cpp
	test_transform_unary.cpp

15 lines

	unique.pass.cpp
	test_unique.cpp

22 lines

	unique_copy_equal.pass.cpp
	test_unique_copy_equal.cpp

22 lines

	alg.nonmodifying/

	adjacent_find.pass.cpp
	test_adjacent_find.cpp

14 lines

	all_of.pass.cpp
	test_all_of.cpp

14 lines

	any_of.pass.cpp
	test_any_of.cpp

14 lines

	count.pass.cpp
	test_count.cpp

12 lines

	equal.pass.cpp
	test_equal.cpp

14 lines

	find.pass.cpp
	test_find.cpp

23 lines

	find_end.pass.cpp
	test_find_end.cpp

12 lines

	find_first_of.pass.cpp
	test_find_first_of.cpp

14 lines

	find_if.pass.cpp
	test_find_if.cpp

15 lines

	for_each.pass.cpp
	test_for_each.cpp

22 lines

	mismatch.pass.cpp
	test_mismatch.cpp

18 lines

	none_of.pass.cpp
	test_none_of.cpp

14 lines

	nth_element.pass.cpp
	test_nth_element.cpp

19 lines

	search_n.pass.cpp
	test_search_n.cpp

15 lines

	alg.sorting/

	alg.heap.operations/

	is_heap.pass.cpp
	test_is_heap.cpp

19 lines

	alg.lex.comparison/

	lexicographical_compare.pass.cpp
	test_lexicographical_compare.cpp

17 lines

	alg.min.max/

	minmax_element.pass.cpp
	test_minmax_element.cpp

42 lines

	alg.set.operations/

	includes.pass.cpp
	test_includes.cpp

20 lines

	set.pass.cpp
	test_set.cpp

18 lines

	is_sorted.pass.cpp
	test_is_sorted.cpp

12 lines

	partial_sort.pass.cpp
	test_partial_sort.cpp

17 lines

	partial_sort_copy.pass.cpp
	test_partial_sort_copy.cpp

24 lines

	sort.pass.cpp
	test_sort.cpp

13 lines

	numerics/	numeric.ops/

	adjacent_difference.pass.cpp
	test_adjacent_difference.cpp

18 lines

	reduce.pass.cpp
	test_reduce.cpp

18 lines

	scan.pass.cpp
	test_scan.cpp

19 lines

	transform_reduce.pass.cpp
	test_transform_reduce.cpp

14 lines

	transform_scan.pass.cpp
	test_transform_scan.cpp

25 lines

	utilities/	memory/	specialized.algorithms/

	uninitialized_construct.pass.cpp
	test_uninitialized_construct.cpp

19 lines

	uninitialized_copy_move.pass.cpp
	test_uninitialized_copy_move.cpp

15 lines

	uninitialized_fill_destroy.pass.cpp
	test_uninitialized_fill_destroy.cpp

16 lines

	support/

	parallel_utils.h
	utils.h

20 lines

pstl_test_config.h

7 lines

test_adjacent_difference.cpp

test_adjacent_find.cpp

test_find_first_of.cpp

test_inplace_merge.cpp

test_is_heap.cpp

test_is_partitioned.cpp

test_is_sorted.cpp

test_lexicographical_compare.cpp

test_merge.cpp

test_minmax_element.cpp

test_mismatch.cpp

test_none_of.cpp

test_nth_element.cpp

test_partial_sort.cpp

test_partial_sort_copy.cpp

test_partition.cpp

test_partition_copy.cpp

test_replace_copy.cpp

test_reverse.cpp

test_reverse_copy.cpp

test_transform_binary.cpp

test_transform_reduce.cpp

test_transform_scan.cpp

test_transform_unary.cpp

test_uninitialized_construct.cpp

test_uninitialized_copy_move.cpp

test_uninitialized_fill_destroy.cpp

Changes from integrating PSTL with libstdc++AbandonedPublicActions

Details

Diff Detail

Event Timeline

Large Diff

Revision ContentsChangeset List

Diff 188992

CMakeLists.txt

build/Makefile

build/Makefile.common

build/Makefile.pstl

build/android.inc

build/android.linux.launcher.sh

build/clang.inc

build/gcc.inc

build/icc.inc

build/icl.inc

build/jni/Android.mk

build/jni/Application.mk

build/macos.inc

build/mingw.inc

build/unix.inc

build/windows.inc

include/pstl/internal/algorithm_fwd.h

include/pstl/internal/glue_algorithm_impl.h

include/pstl/internal/glue_execution_defs.h

include/pstl/internal/glue_memory_impl.h

include/pstl/internal/numeric_fwd.h

include/pstl/internal/numeric_impl.h

test/CMakeLists.txt

test/pstl_test_config.h

test/std/CMakeLists.txt

test/std/algorithms/CMakeLists.txt

test/std/algorithms/alg.merge/CMakeLists.txt

test/std/algorithms/alg.merge/inplace_merge.pass.cpp

test/std/algorithms/alg.merge/merge.pass.cpp

test/std/algorithms/alg.modifying.operations/CMakeLists.txt

test/std/algorithms/alg.modifying.operations/alg.copy/CMakeLists.txt

test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp

test/std/algorithms/alg.modifying.operations/alg.partitions/CMakeLists.txt

test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp

test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp

test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp

test/std/algorithms/alg.modifying.operations/alg.reverse/CMakeLists.txt

test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp

test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp

test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp

test/std/algorithms/alg.modifying.operations/fill.pass.cpp

test/std/algorithms/alg.modifying.operations/generate.pass.cpp

test/std/algorithms/alg.modifying.operations/remove.pass.cpp

test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp

test/std/algorithms/alg.modifying.operations/replace.pass.cpp

test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp

test/std/algorithms/alg.modifying.operations/rotate.pass.cpp

test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp

test/std/algorithms/alg.modifying.operations/swap_ranges.pass.cpp

test/std/algorithms/alg.modifying.operations/transform_binary.pass.cpp

test/std/algorithms/alg.modifying.operations/transform_unary.pass.cpp

test/std/algorithms/alg.modifying.operations/unique.pass.cpp

test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp

test/std/algorithms/alg.nonmodifying/CMakeLists.txt

test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp

test/std/algorithms/alg.nonmodifying/all_of.pass.cpp

test/std/algorithms/alg.nonmodifying/any_of.pass.cpp

test/std/algorithms/alg.nonmodifying/count.pass.cpp

test/std/algorithms/alg.nonmodifying/equal.pass.cpp

test/std/algorithms/alg.nonmodifying/find.pass.cpp

test/std/algorithms/alg.nonmodifying/find_end.pass.cpp

test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp

test/std/algorithms/alg.nonmodifying/find_if.pass.cpp

test/std/algorithms/alg.nonmodifying/for_each.pass.cpp

test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp

test/std/algorithms/alg.nonmodifying/none_of.pass.cpp

test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp

test/std/algorithms/alg.nonmodifying/search_n.pass.cpp

test/std/algorithms/alg.sorting/CMakeLists.txt

test/std/algorithms/alg.sorting/alg.heap.operations/CMakeLists.txt

test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp

test/std/algorithms/alg.sorting/alg.lex.comparison/CMakeLists.txt

test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp

Changes from integrating PSTL with libstdc++
AbandonedPublic
Actions

Revision Contents
Changeset List