Madrid: Barty, Swiatek set up battle of last two French Open champions