Atomics and Materials (erincatto#873)

- shape material
- friction and restitution callbacks from narrow phase
- platform atomic wrappers
- removed experimental:c11atomics flag

erincatto#812 erincatto#872

Author: erincatto

CMakeLists.txt

@@ -47,6 +47,7 @@ endif()
 
 # Deterministic math
 # https://box2d.org/posts/2024/08/determinism/
+# todo make this apply to ClangCL
 if (MINGW OR APPLE OR UNIX)
 	add_compile_options(-ffp-contract=off)
 endif()
@@ -100,7 +101,6 @@ if(PROJECT_IS_TOP_LEVEL)
 
 	# enkiTS is used by all the test apps, but not directly by the Box2D library
 	if(BOX2D_UNIT_TESTS OR BOX2D_SAMPLES OR BOX2D_BENCHMARKS)
-		SET(ENKITS_BUILD_EXAMPLES OFF CACHE BOOL "Build enkiTS examples")
 
 		# Emscripten pthread support for enkiTS
 		if(EMSCRIPTEN)
@@ -111,7 +111,8 @@ if(PROJECT_IS_TOP_LEVEL)
 			string(APPEND CMAKE_EXE_LINKER_FLAGS " ${EMSCRIPTEN_PTHREADS_LINKER_FLAGS}")
 		endif()
 
-		# Used in tests and samples
+		# Task system used in tests and samples
+		set(ENKITS_BUILD_EXAMPLES OFF CACHE BOOL "Build enkiTS examples")
 		FetchContent_Declare(
 			enkits
 			GIT_REPOSITORY https://github.com/dougbinks/enkiTS.git

benchmark/CMakeLists.txt

@@ -7,10 +7,6 @@ add_executable(benchmark ${BOX2D_BENCHMARK_FILES})
 
 set_target_properties(benchmark PROPERTIES C_STANDARD 17)
 
-if (MSVC AND CMAKE_C_COMPILER_ID MATCHES "MSVC")
-	target_compile_options(benchmark PRIVATE /experimental:c11atomics)
-endif()
-
 target_link_libraries(benchmark PRIVATE box2d shared enkiTS)
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${BOX2D_BENCHMARK_FILES})

benchmark/amd7950x_avx2/joint_grid.csv

@@ -1,9 +1,9 @@
-threads,fps
-1,197.415
-2,338.192
-3,485.363
-4,590.58
-5,678.894
-6,755.337
-7,830.03
-8,889.992
+threads,ms
+1,2565.3
+2,1533.85
+3,1053.01
+4,865.702
+5,748.989
+6,658.623
+7,613.633
+8,578.973

benchmark/amd7950x_avx2/large_pyramid.csv

@@ -1,9 +1,9 @@
-threads,fps
-1,337.398
-2,599.766
-3,853.652
-4,1095.24
-5,1288.22
-6,1467.1
-7,1669.81
-8,1704.72
+threads,ms
+1,1584.03
+2,841.862
+3,598.747
+4,471.697
+5,396.306
+6,347.983
+7,309.086
+8,308.832

benchmark/amd7950x_avx2/many_pyramids.csv

@@ -1,9 +1,9 @@
-threads,fps
-1,82.5412
-2,156.573
-3,233.64
-4,294.31
-5,357.121
-6,420.298
-7,487.163
-8,537.355
+threads,ms
+1,2663.34
+2,1407.85
+3,934.506
+4,725.271
+5,590.288
+6,502.513
+7,422.693
+8,395.369

benchmark/amd7950x_avx2/rain.csv

@@ -1,9 +1,9 @@
-threads,fps
-1,158.379
-2,253.381
-3,337.197
-4,408.427
-5,475.14
-6,530.178
-7,583.798
-8,633.102
+threads,ms
+1,6526.9
+2,4017.74
+3,3052.28
+4,2493.5
+5,2149.12
+6,1911.45
+7,1735.97
+8,1625.71

benchmark/amd7950x_avx2/smash.csv

@@ -1,9 +1,9 @@
-threads,fps
-1,194.531
-2,299.76
-3,389.501
-4,469.022
-5,532.045
-6,580.977
-7,620.559
-8,655.217
+threads,ms
+1,1562.06
+2,1020.55
+3,781.193
+4,661.318
+5,580.115
+6,530.502
+7,489.672
+8,467.998

benchmark/amd7950x_avx2/spinner.csv

@@ -1,9 +1,9 @@
-threads,fps
-1,342.697
-2,549.335
-3,711.477
-4,889.473
-5,1011.82
-6,1141.73
-7,1261.39
-8,1338.51
+threads,ms
+1,4106.89
+2,2635.21
+3,1986.32
+4,1614.21
+5,1420.63
+6,1272.06
+7,1157.16
+8,1091.25

benchmark/amd7950x_avx2/tumbler.csv

@@ -1,9 +1,9 @@
-threads,fps
-1,461.248
-2,726.229
-3,947.347
-4,1152.31
-5,1335.66
-6,1483.59
-7,1613.59
-8,1715.86
+threads,ms
+1,1613.69
+2,1061.88
+3,810.738
+4,670.874
+5,578.959
+6,519.473
+7,479.842
+8,437.851

benchmark/main.c

@@ -394,7 +394,7 @@ int main( int argc, char** argv )
 			continue;
 		}
 
-		fprintf( file, "threads, ms\n" );
+		fprintf( file, "threads,ms\n" );
 		for ( int threadIndex = 1; threadIndex <= maxThreadCount; ++threadIndex )
 		{
 			fprintf( file, "%d,%g\n", threadIndex, minTime[threadIndex - 1] );