punk rock vs rock-and-roll

punk rock and rock-and-roll both are nouns.

Word	Noun	Adjective	Verb	Adverb
punk rock	Yes	No	No	No
rock-and-roll	Yes	No	No	No

As nouns, rock-and-roll is a hypernym of punk rock; that is, rock-and-roll is a word with a broader meaning than punk rock:

punk rock: rock music with deliberately offensive lyrics expressing anger and social alienation; in part a reaction against progressive rock
rock-and-roll: a genre of popular music originating in the 1950s; a blend of black rhythm-and-blues with white country-and-western

Other hypernyms of punk rock include rock'n'roll, rock 'n' roll, rock, rock and roll, rock music.

punk rock (noun)	rock-and-roll (noun)
rock music with deliberately offensive lyrics expressing anger and social alienation; in part a reaction against progressive rock	a genre of popular music originating in the 1950s; a blend of black rhythm-and-blues with white country-and-western