In today's use, a tumour normally refers to a neoplasm. A 'non-neoplastic' tumour is technically known as a tumefaction, but is commonly called swelling.
Common forms of swelling (or non-neoplastic tumefactions) are inflammations, edemas, cysts, hemorrhages and congenital malformations like nevus.