Antoine Griezmann has extended his Atletico Madrid contract until 2027, as he bids for Club World Cup glory.