You are correct. All the electron motion in a CPU turns to waste heat or electromagnetic radiation which eventually becomes waste heat.