I should add that, once again Tolkien himself didn't actually publish these two late essays about Glorfindel. But he also didn't publish
The Silmarillion himself, so...
Material published by the author himself: one Glorfindel (of Rivendell)
Posthumously published material: one Glorfindel (of Gondolin and later Rivendell)
Or at least that's how I think it goes
There just happened to be a long gap in time before Silmarillion readers found out about the late essays. And a gap in time between Tolkien publishing
The Lord of the Rings and Tolkien much later sitting down to really try and answer the question for himself.
Or something. Some don't seem to accept the late essays for some reason.