Skip to content

Initial particle sort by cell ID to improve locality #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AhmedSalih3d wants to merge 1 commit into
base: codex/optimize-neighborlist-code-performance
Choose a base branch
from
Open

Initial particle sort by cell ID to improve locality #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/SPHCellList.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,23 @@ using LinearAlgebra
return nothing
end

"""
Sort particle storage by the cell ordering recorded in `ParticleOrder`.

This is intended to be used once at the start of a simulation to improve
locality. After sorting, `ParticleOrder` is reset to the identity mapping.
"""
function SortParticlesByCellID!(SimParticles::StructArray, ParticleOrder)
foreachfield(SimParticles) do Field
FieldSorted = Field[ParticleOrder]
copyto!(Field, FieldSorted)
end
@inbounds for Index in eachindex(ParticleOrder)
ParticleOrder[Index] = Index
end
return nothing
end

# The previous generic `ComputeInteractions!` implementation was unused
# in favour of the per-particle variants (ComputeInteractionsPerParticle! etc.).
# It has been removed to reduce code size and avoid dead code.
Expand Down Expand Up @@ -748,6 +765,9 @@ using LinearAlgebra
# if mod(SimMetaData.Iteration, ceil(Int, SimKernel.H / (SimConstants.c₀ * dt * (1/SimConstants.CFL)) )) == 0 || SimMetaData.Iteration == 1
if ShouldRebuild
@timeit SimMetaData.HourGlass "01a Actual Calculate IndexCounter" SimMetaData.IndexCounter = UpdateNeighbors!(SimParticles, SimKernel.H⁻¹, ParticleRanges, UniqueCells, CellDict, ParticleOrder, CellOffsets)
if SimMetaData.Iteration == 0
@timeit SimMetaData.HourGlass "01b Initial Sort By CellID" SortParticlesByCellID!(SimParticles, ParticleOrder)
end
SimMetaData.Δx = zero(eltype(dρdtI))
UniqueCellsView = view(UniqueCells, 1:SimMetaData.IndexCounter)
BuildNeighborCellLists!(NeighborCellLists, FullStencil, UniqueCellsView, ParticleRanges, CellDict)
Expand Down