Direct conflict is unlikely. Both sides are content with the proxy wars being waged in Yemen and Syria. Why involve your own army when you can pay some other country to do it? Besides, Saudia has a large Shia community, and Iran has a sizeable Sunni community, and I believe both countries are engaged in trade.