I would personally say the matrix is not cyberpunk as its not really a cyberpunk world.

The matrix world is a late 1990'ties world and the "realworld" is a post apocalyptic dystopia.